Skip to content

The open alternative to Salesforce, designed for AI.

Mention Ada in chats and let members turn her off (#28086)

Félix Malfait9ab50cb1be4e
diff --git a/packages/twenty-client-sdk/src/metadata/generated/schema.graphql b/packages/twenty-client-sdk/src/metadata/generated/schema.graphql
index 81b809ac402..95745103511 100644
--- a/packages/twenty-client-sdk/src/metadata/generated/schema.graphql
+++ b/packages/twenty-client-sdk/src/metadata/generated/schema.graphql
@@ -3160,7 +3160,7 @@ type Mutation {
runAgent(input: RunAgentInput!): RunAgentResult!
runApplicationHealthCheck(applicationId: UUID!): ApplicationHealthCheckResult
saveImapSmtpCaldavAccount(connectionParameters: EmailAccountConnectionParameters!, handle: String!, id: UUID): ImapSmtpCaldavConnectionSuccess!
- sendChatMessage(browsingContext: JSON, fileAttachments: [FileAttachmentInput!], mentionedWorkspaceMemberIds: [UUID!], messageId: UUID!, modelId: String, text: String!, threadId: UUID!): SendChatMessageResult!
+ sendChatMessage(browsingContext: JSON, fileAttachments: [FileAttachmentInput!], mentionedWorkspaceMemberIds: [UUID!], messageId: UUID!, modelId: String, shouldAssistantReply: Boolean, text: String!, threadId: UUID!): SendChatMessageResult!
sendEmail(input: SendEmailInput!): SendEmailOutput!
sendInboxMessage(input: SendInboxMessageInput!): SendInboxMessageResult!
sendInvitations(emails: [String!]!, roleId: UUID): SendInvitations!
diff --git a/packages/twenty-client-sdk/src/metadata/generated/schema.ts b/packages/twenty-client-sdk/src/metadata/generated/schema.ts
index cb2a515785b..a97801f2989 100644
--- a/packages/twenty-client-sdk/src/metadata/generated/schema.ts
+++ b/packages/twenty-client-sdk/src/metadata/generated/schema.ts
@@ -6431,7 +6431,7 @@ export interface MutationGenqlSelection{
runAgent?: (RunAgentResultGenqlSelection & { __args: {input: RunAgentInput} })
runApplicationHealthCheck?: (ApplicationHealthCheckResultGenqlSelection & { __args: {applicationId: Scalars['UUID']} })
saveImapSmtpCaldavAccount?: (ImapSmtpCaldavConnectionSuccessGenqlSelection & { __args: {connectionParameters: EmailAccountConnectionParameters, handle: Scalars['String'], id?: (Scalars['UUID'] | null)} })
- sendChatMessage?: (SendChatMessageResultGenqlSelection & { __args: {browsingContext?: (Scalars['JSON'] | null), fileAttachments?: (FileAttachmentInput[] | null), mentionedWorkspaceMemberIds?: (Scalars['UUID'][] | null), messageId: Scalars['UUID'], modelId?: (Scalars['String'] | null), text: Scalars['String'], threadId: Scalars['UUID']} })
+ sendChatMessage?: (SendChatMessageResultGenqlSelection & { __args: {browsingContext?: (Scalars['JSON'] | null), fileAttachments?: (FileAttachmentInput[] | null), mentionedWorkspaceMemberIds?: (Scalars['UUID'][] | null), messageId: Scalars['UUID'], modelId?: (Scalars['String'] | null), shouldAssistantReply?: (Scalars['Boolean'] | null), text: Scalars['String'], threadId: Scalars['UUID']} })
sendEmail?: (SendEmailOutputGenqlSelection & { __args: {input: SendEmailInput} })
sendInboxMessage?: (SendInboxMessageResultGenqlSelection & { __args: {input: SendInboxMessageInput} })
sendInvitations?: (SendInvitationsGenqlSelection & { __args: {emails: Scalars['String'][], roleId?: (Scalars['UUID'] | null)} })
diff --git a/packages/twenty-client-sdk/src/metadata/generated/types.ts b/packages/twenty-client-sdk/src/metadata/generated/types.ts
index 3b4dd953b20..f48fe6777ea 100644
--- a/packages/twenty-client-sdk/src/metadata/generated/types.ts
+++ b/packages/twenty-client-sdk/src/metadata/generated/types.ts
@@ -7697,6 +7697,9 @@ export default {
"modelId": [
1
],
+ "shouldAssistantReply": [
+ 4
+ ],
"text": [
1,
"String!"
diff --git a/packages/twenty-front/src/generated-metadata/graphql.ts b/packages/twenty-front/src/generated-metadata/graphql.ts
index f574f030dbf..99cef3e05fa 100644
--- a/packages/twenty-front/src/generated-metadata/graphql.ts
+++ b/packages/twenty-front/src/generated-metadata/graphql.ts
@@ -4286,6 +4286,7 @@ export type MutationSendChatMessageArgs = {
mentionedWorkspaceMemberIds?: InputMaybe<Array<Scalars['UUID']['input']>>;
messageId: Scalars['UUID']['input'];
modelId?: InputMaybe<Scalars['String']['input']>;
+ shouldAssistantReply?: InputMaybe<Scalars['Boolean']['input']>;
text: Scalars['String']['input'];
threadId: Scalars['UUID']['input'];
};
@@ -8358,6 +8359,7 @@ export type SendChatMessageMutationVariables = Exact<{
modelId?: InputMaybe<Scalars['String']['input']>;
fileAttachments?: InputMaybe<Array<FileAttachmentInput> | FileAttachmentInput>;
mentionedWorkspaceMemberIds?: InputMaybe<Array<Scalars['UUID']['input']> | Scalars['UUID']['input']>;
+ shouldAssistantReply?: InputMaybe<Scalars['Boolean']['input']>;
}>;
@@ -10977,7 +10979,7 @@ export const DeleteQueuedChatMessageDocument = {"kind":"Document","definitions":
export const DeleteSkillDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"DeleteSkill"},"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":"deleteSkill"},"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":"isSystem"}},{"kind":"Field","name":{"kind":"Name","value":"isActive"}},{"kind":"Field","name":{"kind":"Name","value":"applicationId"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}}]} as unknown as DocumentNode<DeleteSkillMutation, DeleteSkillMutationVariables>;
export const RemoveAgentChatMessageReactionDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"RemoveAgentChatMessageReaction"},"variableDefinitions":[{"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":"emoji"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"removeAgentChatMessageReaction"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"messageId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"messageId"}}},{"kind":"Argument","name":{"kind":"Name","value":"emoji"},"value":{"kind":"Variable","name":{"kind":"Name","value":"emoji"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"emoji"}},{"kind":"Field","name":{"kind":"Name","value":"workspaceMemberIds"}}]}}]}}]} as unknown as DocumentNode<RemoveAgentChatMessageReactionMutation, RemoveAgentChatMessageReactionMutationVariables>;
export const RetryChatMessageDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"RetryChatMessage"},"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":"modelId"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"retryChatMessage"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"threadId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"threadId"}}},{"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<RetryChatMessageMutation, RetryChatMessageMutationVariables>;
-export const SendChatMessageDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"SendChatMessage"},"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":"text"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"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":"browsingContext"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"JSON"}}},{"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"}}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"mentionedWorkspaceMemberIds"}},"type":{"kind":"ListType","type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"sendChatMessage"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"threadId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"threadId"}}},{"kind":"Argument","name":{"kind":"Name","value":"text"},"value":{"kind":"Variable","name":{"kind":"Name","value":"text"}}},{"kind":"Argument","name":{"kind":"Name","value":"messageId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"messageId"}}},{"kind":"Argument","name":{"kind":"Name","value":"browsingContext"},"value":{"kind":"Variable","name":{"kind":"Name","value":"browsingContext"}}},{"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"}}},{"kind":"Argument","name":{"kind":"Name","value":"mentionedWorkspaceMemberIds"},"value":{"kind":"Variable","name":{"kind":"Name","value":"mentionedWorkspaceMemberIds"}}}],"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"}},{"kind":"Field","name":{"kind":"Name","value":"mentionedParticipantWorkspaceMemberIds"}}]}}]}}]} as unknown as DocumentNode<SendChatMessageMutation, SendChatMessageMutationVariables>;
+export const SendChatMessageDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"SendChatMessage"},"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":"text"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"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":"browsingContext"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"JSON"}}},{"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"}}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"mentionedWorkspaceMemberIds"}},"type":{"kind":"ListType","type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"shouldAssistantReply"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"Boolean"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"sendChatMessage"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"threadId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"threadId"}}},{"kind":"Argument","name":{"kind":"Name","value":"text"},"value":{"kind":"Variable","name":{"kind":"Name","value":"text"}}},{"kind":"Argument","name":{"kind":"Name","value":"messageId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"messageId"}}},{"kind":"Argument","name":{"kind":"Name","value":"browsingContext"},"value":{"kind":"Variable","name":{"kind":"Name","value":"browsingContext"}}},{"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"}}},{"kind":"Argument","name":{"kind":"Name","value":"mentionedWorkspaceMemberIds"},"value":{"kind":"Variable","name":{"kind":"Name","value":"mentionedWorkspaceMemberIds"}}},{"kind":"Argument","name":{"kind":"Name","value":"shouldAssistantReply"},"value":{"kind":"Variable","name":{"kind":"Name","value":"shouldAssistantReply"}}}],"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"}},{"kind":"Field","name":{"kind":"Name","value":"mentionedParticipantWorkspaceMemberIds"}}]}}]}}]} as unknown as DocumentNode<SendChatMessageMutation, SendChatMessageMutationVariables>;
export const StopAgentChatStreamDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"StopAgentChatStream"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"threadId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"stopAgentChatStream"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"threadId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"threadId"}}}]}]}}]} as unknown as DocumentNode<StopAgentChatStreamMutation, StopAgentChatStreamMutationVariables>;
export const UpdateAgentChatThreadInboxStateDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpdateAgentChatThreadInboxState"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"threadIds"}},"type":{"kind":"NonNullType","type":{"kind":"ListType","type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"action"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"AgentChatInboxAction"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"snoozedUntil"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"DateTime"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"updateAgentChatThreadInboxState"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"threadIds"},"value":{"kind":"Variable","name":{"kind":"Name","value":"threadIds"}}},{"kind":"Argument","name":{"kind":"Name","value":"action"},"value":{"kind":"Variable","name":{"kind":"Name","value":"action"}}},{"kind":"Argument","name":{"kind":"Name","value":"snoozedUntil"},"value":{"kind":"Variable","name":{"kind":"Name","value":"snoozedUntil"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"AgentChatThreadParticipantFields"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"AgentChatThreadParticipantFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"AgentChatThreadParticipant"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"threadId"}},{"kind":"Field","name":{"kind":"Name","value":"lastReadAt"}},{"kind":"Field","name":{"kind":"Name","value":"archivedAt"}},{"kind":"Field","name":{"kind":"Name","value":"snoozedUntil"}},{"kind":"Field","name":{"kind":"Name","value":"isSubscribed"}},{"kind":"Field","name":{"kind":"Name","value":"lastMentionedAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}}]} as unknown as DocumentNode<UpdateAgentChatThreadInboxStateMutation, UpdateAgentChatThreadInboxStateMutationVariables>;
export const UpdateOneAgentDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpdateOneAgent"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UpdateAgentInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"updateOneAgent"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"AgentFields"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"AgentFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Agent"}},"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":"prompt"}},{"kind":"Field","name":{"kind":"Name","value":"modelId"}},{"kind":"Field","name":{"kind":"Name","value":"responseFormat"}},{"kind":"Field","name":{"kind":"Name","value":"roleId"}},{"kind":"Field","name":{"kind":"Name","value":"isCustom"}},{"kind":"Field","name":{"kind":"Name","value":"isSystem"}},{"kind":"Field","name":{"kind":"Name","value":"modelConfiguration"}},{"kind":"Field","name":{"kind":"Name","value":"triggers"}},{"kind":"Field","name":{"kind":"Name","value":"applicationId"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}}]} as unknown as DocumentNode<UpdateOneAgentMutation, UpdateOneAgentMutationVariables>;
diff --git a/packages/twenty-front/src/modules/ai/components/AiModelTierDropdown.tsx b/packages/twenty-front/src/modules/ai/components/AiModelTierDropdown.tsx
index ba8149f24c2..4b67ca34e76 100644
--- a/packages/twenty-front/src/modules/ai/components/AiModelTierDropdown.tsx
+++ b/packages/twenty-front/src/modules/ai/components/AiModelTierDropdown.tsx
@@ -1,7 +1,10 @@
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
+import { useId } from 'react';
import { AI_MODEL_TIERS, type AiModelTier } from 'twenty-shared/ai';
+import { FeatureFlagKey } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
+import { Switch } from 'twenty-ui/primitives/input';
import { themeCssVariables } from 'twenty-ui/theme';
import { AiModelTierBars } from '@/ai/components/AiModelTierBars';
@@ -9,7 +12,10 @@ import { AiModelTierSlider } from '@/ai/components/AiModelTierSlider';
import { useAiModelTiers } from '@/ai/hooks/useAiModelTiers';
import { useIsWorkspaceSetupChat } from '@/ai/hooks/useIsWorkspaceSetupChat';
import { useWorkspaceAiModelTiers } from '@/ai/hooks/useWorkspaceAiModelTiers';
+import { AGENT_CHAT_ASSISTANT_NAME } from '@/ai/constants/AgentChatAssistantName';
+import { agentChatIsAssistantOffState } from '@/ai/states/agentChatIsAssistantOffState';
import { agentChatUserSelectedModelTierState } from '@/ai/states/agentChatUserSelectedModelTierState';
+import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
import { Dropdown } from 'twenty-ui/components/navigation';
import { DropdownRoot } from '@/ui/layout/dropdown/components/DropdownRoot';
import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
@@ -18,9 +24,21 @@ import { useAtomState } from '@/ui/utilities/state/jotai/hooks/useAtomState';
const SLIDER_DROPDOWN_WIDTH_PX = 240;
const StyledSliderContainer = styled.div`
+ display: flex;
+ flex-direction: column;
+ gap: ${themeCssVariables.spacing[3]};
padding: ${themeCssVariables.spacing[3]};
`;
+const StyledAssistantSwitchRow = styled.label`
+ align-items: center;
+ color: ${themeCssVariables.font.color.primary};
+ cursor: pointer;
+ display: flex;
+ font-size: ${themeCssVariables.font.size.md};
+ justify-content: space-between;
+`;
+
type AiModelTierDropdownProps = {
dropdownId: string;
disabled?: boolean;
@@ -36,6 +54,14 @@ export const AiModelTierDropdown = ({
const isWorkspaceSetupChat = useIsWorkspaceSetupChat();
const [agentChatUserSelectedModelTier, setAgentChatUserSelectedModelTier] =
useAtomState(agentChatUserSelectedModelTierState);
+ const [agentChatIsAssistantOff, setAgentChatIsAssistantOff] = useAtomState(
+ agentChatIsAssistantOffState,
+ );
+ const isAiChatInboxEnabled = useIsFeatureEnabled(
+ FeatureFlagKey.IS_AI_CHAT_INBOX_ENABLED,
+ );
+ const assistantSwitchId = useId();
+ const isAssistantOff = isAiChatInboxEnabled && agentChatIsAssistantOff;
// The setup chat always runs on the fast tier server-side.
const workspaceTier: AiModelTier = isWorkspaceSetupChat ? 'fast' : chatTier;
@@ -43,6 +69,13 @@ export const AiModelTierDropdown = ({
const selectedTier = agentChatUserSelectedModelTier ?? workspaceTier;
const selectedResolvedTier = tiers[AI_MODEL_TIERS.indexOf(selectedTier)];
+ const tierLabel = isDefined(selectedResolvedTier.model)
+ ? t`${selectedResolvedTier.label}: ${selectedResolvedTier.model.label}`
+ : selectedResolvedTier.label;
+ const triggerLabel = isAssistantOff
+ ? t`${AGENT_CHAT_ASSISTANT_NAME} is off`
+ : tierLabel;
+
const handleTierChange = (tier: AiModelTier) => {
setAgentChatUserSelectedModelTier(tier === workspaceTier ? null : tier);
};
@@ -54,11 +87,7 @@ export const AiModelTierDropdown = ({
render={
<AiModelTierBars
selectedTier={selectedTier}
- label={
- isDefined(selectedResolvedTier.model)
- ? t`${selectedResolvedTier.label}: ${selectedResolvedTier.model.label}`
- : selectedResolvedTier.label
- }
+ label={triggerLabel}
disabled={disabled}
/>
}
@@ -71,10 +100,23 @@ export const AiModelTierDropdown = ({
aria-label={t`Choose a model mode`}
>
<StyledSliderContainer role="group" aria-label={t`Choose a model mode`}>
+ {isAiChatInboxEnabled && (
+ <StyledAssistantSwitchRow htmlFor={assistantSwitchId}>
+ {t`${AGENT_CHAT_ASSISTANT_NAME} replies`}
+ <Switch
+ id={assistantSwitchId}
+ checked={!agentChatIsAssistantOff}
+ onCheckedChange={(checked) =>
+ setAgentChatIsAssistantOff(!checked)
+ }
+ disabled={disabled}
+ />
+ </StyledAssistantSwitchRow>
+ )}
<AiModelTierSlider
selectedTier={selectedTier}
onTierChange={handleTierChange}
- disabled={disabled}
+ disabled={disabled || isAssistantOff}
/>
</StyledSliderContainer>
</DropdownContent>
diff --git a/packages/twenty-front/src/modules/ai/graphql/mutations/sendChatMessage.ts b/packages/twenty-front/src/modules/ai/graphql/mutations/sendChatMessage.ts
index cc89cfddb61..b2b2c4c78bd 100644
--- a/packages/twenty-front/src/modules/ai/graphql/mutations/sendChatMessage.ts
+++ b/packages/twenty-front/src/modules/ai/graphql/mutations/sendChatMessage.ts
@@ -9,6 +9,7 @@ export const SEND_CHAT_MESSAGE = gql`
$modelId: String
$fileAttachments: [FileAttachmentInput!]
$mentionedWorkspaceMemberIds: [UUID!]
+ $shouldAssistantReply: Boolean
) {
sendChatMessage(
threadId: $threadId
@@ -18,6 +19,7 @@ export const SEND_CHAT_MESSAGE = gql`
modelId: $modelId
fileAttachments: $fileAttachments
mentionedWorkspaceMemberIds: $mentionedWorkspaceMemberIds
+ shouldAssistantReply: $shouldAssistantReply
) {
messageId
queued
diff --git a/packages/twenty-front/src/modules/ai/hooks/useAgentChat.ts b/packages/twenty-front/src/modules/ai/hooks/useAgentChat.ts
index d3740f3d007..9124fcdd4f5 100644
--- a/packages/twenty-front/src/modules/ai/hooks/useAgentChat.ts
+++ b/packages/twenty-front/src/modules/ai/hooks/useAgentChat.ts
@@ -28,10 +28,12 @@ import { agentChatUploadedFilesState } from '@/ai/states/agentChatUploadedFilesS
import { currentAiChatThreadState } from '@/ai/states/currentAiChatThreadState';
import { agentChatErrorFamilyState } from '@/ai/states/agentChatErrorFamilyState';
import { agentChatIsAwaitingFirstChunkFamilyState } from '@/ai/states/agentChatIsAwaitingFirstChunkFamilyState';
+import { agentChatIsAssistantOffState } from '@/ai/states/agentChatIsAssistantOffState';
import { agentChatMessagesFamilyState } from '@/ai/states/agentChatMessagesFamilyState';
import { newAiChatThreadIdState } from '@/ai/states/newAiChatThreadIdState';
import { getConversationTargetsFromSerializedDocument } from '@/ai/utils/getConversationTargetsFromSerializedDocument';
import { getParticipantMentionsFromSerializedDocument } from '@/ai/utils/getParticipantMentionsFromSerializedDocument';
+import { isAgentChatAssistantMentionedInSerializedDocument } from '@/ai/utils/isAgentChatAssistantMentionedInSerializedDocument';
import { isAiChatCreditsExhaustedError } from '@/ai/utils/isAiChatCreditsExhaustedError';
import { toAiChatError } from '@/ai/utils/toAiChatError';
import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
@@ -211,16 +213,30 @@ export const useAgentChat = () => {
({ workspaceMemberId }) => workspaceMemberId,
)
: undefined,
+ shouldAssistantReply:
+ !store.get(agentChatIsAssistantOffState.atom) ||
+ isAgentChatAssistantMentionedInSerializedDocument(
+ serializedContentToSend,
+ ),
},
});
- // The stream may already have set a newer credits-exhausted error; don't clear it.
- if (!isAiChatCreditsExhaustedError(store.get(errorAtom))) {
- store.set(currentWorkspaceState.atom, markWorkspaceCreditsAvailable);
- }
+ const isAssistantReplying =
+ data?.sendChatMessage.queued === true ||
+ isDefined(data?.sendChatMessage.streamId);
+
+ if (isAssistantReplying) {
+ // The stream may already have set a newer credits-exhausted error; don't clear it.
+ if (!isAiChatCreditsExhaustedError(store.get(errorAtom))) {
+ store.set(currentWorkspaceState.atom, markWorkspaceCreditsAvailable);
+ }
- if (isBrowsingContextChanged) {
- store.set(lastSentBrowsingContextAtom, browsingContext);
+ // Only a turn reads the context, so a later turn still needs it otherwise
+ if (isBrowsingContextChanged) {
+ store.set(lastSentBrowsingContextAtom, browsingContext);
+ }
+ } else {
+ store.set(isAwaitingFirstChunkAtom, false);
}
// Filed after the send: a failed send restores the draft, so the retry files it.
diff --git a/packages/twenty-front/src/modules/ai/hooks/useAgentChatSubscription.ts b/packages/twenty-front/src/modules/ai/hooks/useAgentChatSubscription.ts
index 9d8e338e888..3fae458eed6 100644
--- a/packages/twenty-front/src/modules/ai/hooks/useAgentChatSubscription.ts
+++ b/packages/twenty-front/src/modules/ai/hooks/useAgentChatSubscription.ts
@@ -262,6 +262,7 @@ export const useAgentChatSubscription = (threadId: string | null) => {
break;
}
+ case 'message-added':
case 'tool-call-resolved': {
dispatchBrowserEvent(AGENT_CHAT_REFETCH_MESSAGES_EVENT_NAME);
break;
diff --git a/packages/twenty-front/src/modules/ai/hooks/useAiChatEditor.ts b/packages/twenty-front/src/modules/ai/hooks/useAiChatEditor.ts
index aee8b3638db..40337aea63e 100644
--- a/packages/twenty-front/src/modules/ai/hooks/useAiChatEditor.ts
+++ b/packages/twenty-front/src/modules/ai/hooks/useAiChatEditor.ts
@@ -16,6 +16,7 @@ import { AGENT_CHAT_SEND_MESSAGE_EVENT_NAME } from '@/ai/constants/AgentChatSend
import { dispatchBrowserEvent } from '@/browser-event/utils/dispatchBrowserEvent';
import { MENTION_SUGGESTION_PLUGIN_KEY } from '@/mention/constants/MentionSuggestionPluginKey';
import { useMentionSearch } from '@/mention/hooks/useMentionSearch';
+import { getAgentChatAssistantMentionSearchResults } from '@/ai/utils/getAgentChatAssistantMentionSearchResults';
import { useWorkspaceMemberMentionSearch } from '@/mention/hooks/useWorkspaceMemberMentionSearch';
import { SKILL_SUGGESTION_PLUGIN_KEY } from '@/skill-suggestion/constants/SkillSuggestionPluginKey';
import { useSkillSuggestionSearch } from '@/skill-suggestion/hooks/useSkillSuggestionSearch';
@@ -134,7 +135,14 @@ export const useAiChatEditor = () => {
};
mentionStorage.searchMentionRecords = searchMentionRecords;
mentionStorage.searchWorkspaceMembers = isAiChatInboxEnabled
- ? searchWorkspaceMembers
+ ? (query) => [
+ ...getAgentChatAssistantMentionSearchResults({
+ query,
+ objectLabelSingular: t`Assistant`,
+ objectLabelPlural: t`Teammates`,
+ }),
+ ...searchWorkspaceMembers(query),
+ ]
: () => [];
const skillStorage = storage['skill-suggestion'] as {
diff --git a/packages/twenty-front/src/modules/ai/states/agentChatIsAssistantOffState.ts b/packages/twenty-front/src/modules/ai/states/agentChatIsAssistantOffState.ts
new file mode 100644
index 00000000000..352b990545f
--- /dev/null
+++ b/packages/twenty-front/src/modules/ai/states/agentChatIsAssistantOffState.ts
@@ -0,0 +1,8 @@
+import { createAtomState } from '@/ui/utilities/state/jotai/utils/createAtomState';
+
+export const agentChatIsAssistantOffState = createAtomState<boolean>({
+ key: 'ai/agentChatIsAssistantOff',
+ defaultValue: false,
+ useLocalStorage: true,
+ localStorageOptions: { getOnInit: true },
+});
diff --git a/packages/twenty-front/src/modules/ai/utils/__tests__/getAgentChatAssistantMentionSearchResults.test.ts b/packages/twenty-front/src/modules/ai/utils/__tests__/getAgentChatAssistantMentionSearchResults.test.ts
new file mode 100644
index 00000000000..7ec34cf8878
--- /dev/null
+++ b/packages/twenty-front/src/modules/ai/utils/__tests__/getAgentChatAssistantMentionSearchResults.test.ts
@@ -0,0 +1,33 @@
+import { getAgentChatAssistantMentionSearchResults } from '@/ai/utils/getAgentChatAssistantMentionSearchResults';
+
+describe('getAgentChatAssistantMentionSearchResults', () => {
+ it('offers the assistant before anything is typed', () => {
+ expect(
+ getAgentChatAssistantMentionSearchResults({
+ query: '',
+ objectLabelSingular: 'Assistant',
+ objectLabelPlural: 'Teammates',
+ }).map(({ label }) => label),
+ ).toEqual(['Ada']);
+ });
+
+ it('offers the assistant when its name is typed', () => {
+ expect(
+ getAgentChatAssistantMentionSearchResults({
+ query: 'AD',
+ objectLabelSingular: 'Assistant',
+ objectLabelPlural: 'Teammates',
+ }),
+ ).toHaveLength(1);
+ });
+
+ it('leaves the assistant out when the name does not match', () => {
+ expect(
+ getAgentChatAssistantMentionSearchResults({
+ query: 'jane',
+ objectLabelSingular: 'Assistant',
+ objectLabelPlural: 'Teammates',
+ }),
+ ).toEqual([]);
+ });
+});
diff --git a/packages/twenty-front/src/modules/ai/utils/__tests__/isAgentChatAssistantMentionedInSerializedDocument.test.ts b/packages/twenty-front/src/modules/ai/utils/__tests__/isAgentChatAssistantMentionedInSerializedDocument.test.ts
new file mode 100644
index 00000000000..3621024f207
--- /dev/null
+++ b/packages/twenty-front/src/modules/ai/utils/__tests__/isAgentChatAssistantMentionedInSerializedDocument.test.ts
@@ -0,0 +1,47 @@
+import { AGENT_CHAT_ASSISTANT_MENTION_OBJECT_NAME_SINGULAR } from 'twenty-shared/ai';
+import { CoreObjectNameSingular } from 'twenty-shared/types';
+
+import { isAgentChatAssistantMentionedInSerializedDocument } from '@/ai/utils/isAgentChatAssistantMentionedInSerializedDocument';
+import { serializeJsonContentAsAdvancedTextEditorDocument } from '@/advanced-text-editor/utils/serializeJsonContentAsAdvancedTextEditorDocument';
+import { getMentionTagContent } from '@/mention/utils/getMentionTagContent';
+
+const serializeParagraph = (content: ReturnType<typeof getMentionTagContent>) =>
+ serializeJsonContentAsAdvancedTextEditorDocument({
+ type: 'doc',
+ content: [{ type: 'paragraph', content }],
+ });
+
+describe('isAgentChatAssistantMentionedInSerializedDocument', () => {
+ it('finds a mention of the assistant', () => {
+ expect(
+ isAgentChatAssistantMentionedInSerializedDocument(
+ serializeParagraph(
+ getMentionTagContent({
+ recordId: AGENT_CHAT_ASSISTANT_MENTION_OBJECT_NAME_SINGULAR,
+ objectNameSingular:
+ AGENT_CHAT_ASSISTANT_MENTION_OBJECT_NAME_SINGULAR,
+ label: 'Ada',
+ imageUrl: '',
+ shouldAddAsParticipant: false,
+ }),
+ ),
+ ),
+ ).toBe(true);
+ });
+
+ it('ignores mentions of teammates', () => {
+ expect(
+ isAgentChatAssistantMentionedInSerializedDocument(
+ serializeParagraph(
+ getMentionTagContent({
+ recordId: '20202020-463f-435b-828c-107e007a2711',
+ objectNameSingular: CoreObjectNameSingular.WorkspaceMember,
+ label: 'Jane Austen',
+ imageUrl: '',
+ shouldAddAsParticipant: true,
+ }),
+ ),
+ ),
+ ).toBe(false);
+ });
+});
diff --git a/packages/twenty-front/src/modules/ai/utils/getAgentChatAssistantMentionSearchResults.ts b/packages/twenty-front/src/modules/ai/utils/getAgentChatAssistantMentionSearchResults.ts
new file mode 100644
index 00000000000..fdbc9acf929
--- /dev/null
+++ b/packages/twenty-front/src/modules/ai/utils/getAgentChatAssistantMentionSearchResults.ts
@@ -0,0 +1,26 @@
+import { AGENT_CHAT_ASSISTANT_MENTION_OBJECT_NAME_SINGULAR } from 'twenty-shared/ai';
+
+import { AGENT_CHAT_ASSISTANT_NAME } from '@/ai/constants/AgentChatAssistantName';
+import type { MentionSearchResult } from '@/mention/types/MentionSearchResult';
+
+export const getAgentChatAssistantMentionSearchResults = ({
+ query,
+ objectLabelSingular,
+ objectLabelPlural,
+}: {
+ query: string;
+ objectLabelSingular: string;
+ objectLabelPlural: string;
+}): MentionSearchResult[] =>
+ AGENT_CHAT_ASSISTANT_NAME.toLowerCase().includes(query.trim().toLowerCase())
+ ? [
+ {
+ recordId: AGENT_CHAT_ASSISTANT_MENTION_OBJECT_NAME_SINGULAR,
+ objectNameSingular: AGENT_CHAT_ASSISTANT_MENTION_OBJECT_NAME_SINGULAR,
+ objectLabelSingular,
+ objectLabelPlural,
+ label: AGENT_CHAT_ASSISTANT_NAME,
+ imageUrl: '',
+ },
+ ]
+ : [];
diff --git a/packages/twenty-front/src/modules/ai/utils/isAgentChatAssistantMentionedInSerializedDocument.ts b/packages/twenty-front/src/modules/ai/utils/isAgentChatAssistantMentionedInSerializedDocument.ts
new file mode 100644
index 00000000000..efa765292a0
--- /dev/null
+++ b/packages/twenty-front/src/modules/ai/utils/isAgentChatAssistantMentionedInSerializedDocument.ts
@@ -0,0 +1,21 @@
+import { AGENT_CHAT_ASSISTANT_MENTION_OBJECT_NAME_SINGULAR } from 'twenty-shared/ai';
+import {
+ isDefined,
+ parseCanonicalTipTapJsonDocument,
+ TIPTAP_NODE_TYPES,
+ type TipTapNode,
+} from 'twenty-shared/utils';
+
+const isAssistantMentionedInNode = (node: TipTapNode): boolean =>
+ (node.type === TIPTAP_NODE_TYPES.MENTION_TAG &&
+ node.attrs?.objectNameSingular ===
+ AGENT_CHAT_ASSISTANT_MENTION_OBJECT_NAME_SINGULAR) ||
+ (node.content ?? []).some(isAssistantMentionedInNode);
+
+export const isAgentChatAssistantMentionedInSerializedDocument = (
+ serializedDocument: string,
+): boolean => {
+ const document = parseCanonicalTipTapJsonDocument(serializedDocument);
+
+ return isDefined(document) && isAssistantMentionedInNode(document);
+};
diff --git a/packages/twenty-front/src/modules/mention/components/MentionChip.tsx b/packages/twenty-front/src/modules/mention/components/MentionChip.tsx
index 6e0aafd937c..b8db27ddf4a 100644
--- a/packages/twenty-front/src/modules/mention/components/MentionChip.tsx
+++ b/packages/twenty-front/src/modules/mention/components/MentionChip.tsx
@@ -1,5 +1,7 @@
import { type NodeViewProps } from '@tiptap/core';
import { NodeViewWrapper } from '@tiptap/react';
+import { AGENT_CHAT_ASSISTANT_MENTION_OBJECT_NAME_SINGULAR } from 'twenty-shared/ai';
+import { Chip } from 'twenty-ui/primitives/data-display';
import { MentionRecordChip } from '@/mention/components/MentionRecordChip';
@@ -11,6 +13,16 @@ export const MentionChip = ({ node }: MentionChipProps) => {
const label = node.attrs.label as string;
const imageUrl = (node.attrs.imageUrl as string) ?? '';
+ if (
+ objectNameSingular === AGENT_CHAT_ASSISTANT_MENTION_OBJECT_NAME_SINGULAR
+ ) {
+ return (
+ <NodeViewWrapper as="span" style={{ display: 'inline' }}>
+ <Chip variant="soft">{`@${label}`}</Chip>
+ </NodeViewWrapper>
+ );
+ }
+
return (
<NodeViewWrapper as="span" style={{ display: 'inline' }}>
<MentionRecordChip
diff --git a/packages/twenty-front/src/modules/mention/components/MentionSuggestionMenu.tsx b/packages/twenty-front/src/modules/mention/components/MentionSuggestionMenu.tsx
index 7cb4f750449..f6ef274a555 100644
--- a/packages/twenty-front/src/modules/mention/components/MentionSuggestionMenu.tsx
+++ b/packages/twenty-front/src/modules/mention/components/MentionSuggestionMenu.tsx
@@ -1,9 +1,11 @@
import { forwardRef } from 'react';
+import { CoreObjectNameSingular } from 'twenty-shared/types';
import { MenuItemSuggestion } from 'twenty-ui/components/navigation';
import type { MentionSearchResult } from '@/mention/types/MentionSearchResult';
import type { MentionSuggestionMenuProps } from '@/mention/types/MentionSuggestionMenuProps';
import { groupMentionSearchResultsBySection } from '@/mention/utils/groupMentionSearchResultsBySection';
+import { isTeammateMentionSearchResult } from '@/mention/utils/isTeammateMentionSearchResult';
import { AvatarOrIcon } from '@/ui/field/display/components/internal/AvatarOrIcon/AvatarOrIcon';
import { SuggestionMenu } from '@/ui/suggestion/components/SuggestionMenu';
import { getAbsoluteImageUrl } from '~/utils/image/getAbsoluteImageUrl';
@@ -12,7 +14,9 @@ const getItemKey = (item: MentionSearchResult) =>
`${item.objectNameSingular}-${item.recordId}`;
const getItemSection = (item: MentionSearchResult) => ({
- key: item.objectNameSingular,
+ key: isTeammateMentionSearchResult(item)
+ ? CoreObjectNameSingular.WorkspaceMember
+ : item.objectNameSingular,
label: item.objectLabelPlural,
});
diff --git a/packages/twenty-front/src/modules/mention/components/__tests__/MentionSuggestionMenu.test.tsx b/packages/twenty-front/src/modules/mention/components/__tests__/MentionSuggestionMenu.test.tsx
index 174317da5d6..caeff043f82 100644
--- a/packages/twenty-front/src/modules/mention/components/__tests__/MentionSuggestionMenu.test.tsx
+++ b/packages/twenty-front/src/modules/mention/components/__tests__/MentionSuggestionMenu.test.tsx
@@ -2,6 +2,7 @@ import { i18n } from '@lingui/core';
import { I18nProvider } from '@lingui/react';
import { render, screen } from '@testing-library/react';
import { type Editor } from '@tiptap/core';
+import { AGENT_CHAT_ASSISTANT_MENTION_OBJECT_NAME_SINGULAR } from 'twenty-shared/ai';
import { CoreObjectNameSingular } from 'twenty-shared/types';
import { MentionSuggestionMenu } from '@/mention/components/MentionSuggestionMenu';
@@ -97,4 +98,38 @@ describe('MentionSuggestionMenu', () => {
expect(screen.getAllByText('Accounts')).toHaveLength(2);
});
+
+ it('lists the assistant with teammates under one section', () => {
+ const Wrapper = getJestMetadataAndApolloMocksWrapper({});
+
+ render(
+ <Wrapper>
+ <I18nProvider i18n={i18n}>
+ <MentionSuggestionMenu
+ items={[
+ buildResult(
+ 'Grace Hopper',
+ CoreObjectNameSingular.WorkspaceMember,
+ 'Teammates',
+ ),
+ buildResult(
+ 'Ada',
+ AGENT_CHAT_ASSISTANT_MENTION_OBJECT_NAME_SINGULAR,
+ 'Teammates',
+ ),
+ ]}
+ onSelect={jest.fn()}
+ editor={editor}
+ range={{ from: 0, to: 1 }}
+ />
+ </I18nProvider>
+ </Wrapper>,
+ );
+
+ expect(
+ screen
+ .getAllByText(/^(Teammates|Grace Hopper|Ada)$/)
+ .map((element) => element.textContent),
+ ).toEqual(['Teammates', 'Ada', 'Grace Hopper']);
+ });
});
diff --git a/packages/twenty-front/src/modules/mention/utils/__tests__/groupMentionSearchResultsBySection.test.ts b/packages/twenty-front/src/modules/mention/utils/__tests__/groupMentionSearchResultsBySection.test.ts
index aa69be9ea57..dc29d086e1c 100644
--- a/packages/twenty-front/src/modules/mention/utils/__tests__/groupMentionSearchResultsBySection.test.ts
+++ b/packages/twenty-front/src/modules/mention/utils/__tests__/groupMentionSearchResultsBySection.test.ts
@@ -1,3 +1,4 @@
+import { AGENT_CHAT_ASSISTANT_MENTION_OBJECT_NAME_SINGULAR } from 'twenty-shared/ai';
import { CoreObjectNameSingular } from 'twenty-shared/types';
import type { MentionSearchResult } from '@/mention/types/MentionSearchResult';
@@ -30,4 +31,19 @@ describe('groupMentionSearchResultsBySection', () => {
groupMentionSearchResultsBySection(items).map(({ label }) => label),
).toEqual(['Grace', 'Phil', 'Tim', 'Acme', 'Globex', 'Ada']);
});
+
+ it('puts the assistant before teammates', () => {
+ const items = [
+ buildResult('Grace', CoreObjectNameSingular.WorkspaceMember),
+ buildResult('Acme', CoreObjectNameSingular.Company),
+ buildResult(
+ 'Assistant',
+ AGENT_CHAT_ASSISTANT_MENTION_OBJECT_NAME_SINGULAR,
+ ),
+ ];
+
+ expect(
+ groupMentionSearchResultsBySection(items).map(({ label }) => label),
+ ).toEqual(['Assistant', 'Grace', 'Acme']);
+ });
});
diff --git a/packages/twenty-front/src/modules/mention/utils/groupMentionSearchResultsBySection.ts b/packages/twenty-front/src/modules/mention/utils/groupMentionSearchResultsBySection.ts
index 83be2983aec..dc1b5da7b7f 100644
--- a/packages/twenty-front/src/modules/mention/utils/groupMentionSearchResultsBySection.ts
+++ b/packages/twenty-front/src/modules/mention/utils/groupMentionSearchResultsBySection.ts
@@ -1,17 +1,23 @@
import type { MentionSearchResult } from '@/mention/types/MentionSearchResult';
+import { isTeammateMentionSearchResult } from '@/mention/utils/isTeammateMentionSearchResult';
import { isWorkspaceMemberMentionSearchResult } from '@/mention/utils/isWorkspaceMemberMentionSearchResult';
export const groupMentionSearchResultsBySection = (
items: MentionSearchResult[],
): MentionSearchResult[] => {
const recordItems = items.filter(
- (item) => !isWorkspaceMemberMentionSearchResult(item),
+ (item) => !isTeammateMentionSearchResult(item),
);
const objectNamesInRankOrder = [
...new Set(recordItems.map(({ objectNameSingular }) => objectNameSingular)),
];
return [
+ ...items.filter(
+ (item) =>
+ isTeammateMentionSearchResult(item) &&
+ !isWorkspaceMemberMentionSearchResult(item),
+ ),
...items.filter(isWorkspaceMemberMentionSearchResult),
...objectNamesInRankOrder.flatMap((objectNameSingular) =>
recordItems.filter(
diff --git a/packages/twenty-front/src/modules/mention/utils/isTeammateMentionSearchResult.ts b/packages/twenty-front/src/modules/mention/utils/isTeammateMentionSearchResult.ts
new file mode 100644
index 00000000000..20f7d51d064
--- /dev/null
+++ b/packages/twenty-front/src/modules/mention/utils/isTeammateMentionSearchResult.ts
@@ -0,0 +1,10 @@
+import { AGENT_CHAT_ASSISTANT_MENTION_OBJECT_NAME_SINGULAR } from 'twenty-shared/ai';
+
+import type { MentionSearchResult } from '@/mention/types/MentionSearchResult';
+import { isWorkspaceMemberMentionSearchResult } from '@/mention/utils/isWorkspaceMemberMentionSearchResult';
+
+export const isTeammateMentionSearchResult = (
+ item: Pick<MentionSearchResult, 'objectNameSingular'>,
+) =>
+ isWorkspaceMemberMentionSearchResult(item) ||
+ item.objectNameSingular === AGENT_CHAT_ASSISTANT_MENTION_OBJECT_NAME_SINGULAR;
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/resolvers/__tests__/agent-chat.resolver.sharing.spec.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/resolvers/__tests__/agent-chat.resolver.sharing.spec.ts
index 276ea765ea9..9f9c3152eb2 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/resolvers/__tests__/agent-chat.resolver.sharing.spec.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/resolvers/__tests__/agent-chat.resolver.sharing.spec.ts
@@ -89,6 +89,9 @@ const buildResolver = () => {
streamAgentChat: jest
.fn()
.mockResolvedValue({ queued: false, messageId: 'message' }),
+ saveMessageWithoutReply: jest
+ .fn()
+ .mockResolvedValue({ messageId: 'message' }),
};
const streamRecovery = { reapDeadStream: jest.fn().mockResolvedValue(null) };
const events = {
@@ -98,6 +101,9 @@ const buildResolver = () => {
.mockResolvedValue({ chunks: [], maxSeq: 0 }),
};
const redis = { getClient: jest.fn() };
+ const featureFlags = {
+ isFeatureEnabled: jest.fn().mockResolvedValue(true),
+ };
const threadLifecycle = new AgentChatThreadLifecycleService(
threadRepository as never,
redis as never,
@@ -135,6 +141,7 @@ const buildResolver = () => {
},
}),
} as never,
+ featureFlags as never,
messageReactions as never,
);
return {
@@ -142,6 +149,7 @@ const buildResolver = () => {
chatService,
threadService,
threadRepository,
+ featureFlags,
messages,
sharing,
streaming,
@@ -351,6 +359,45 @@ describe('Shared conversation API boundaries', () => {
);
});
+ const sendWithAssistantOff = (resolver: AgentChatResolver) =>
+ resolver.sendChatMessage(
+ THREAD_ID,
+ 'Tim, can you take this one?',
+ 'message',
+ null,
+ undefined,
+ null,
+ ['tim'],
+ 'owner-user',
+ 'owner',
+ workspace,
+ false,
+ );
+
+ it('saves a message without starting a turn when the assistant is off', async () => {
+ const { resolver, streaming } = buildResolver();
+
+ const result = await sendWithAssistantOff(resolver);
+
+ expect(streaming.saveMessageWithoutReply).toHaveBeenCalled();
+ expect(streaming.streamAgentChat).not.toHaveBeenCalled();
+ expect(result).toEqual(
+ expect.objectContaining({ messageId: 'message', queued: false }),
+ );
+ expect(result.streamId).toBeUndefined();
+ });
+
+ it('still replies when the assistant is off but the inbox is not enabled', async () => {
+ const { resolver, streaming, featureFlags } = buildResolver();
+
+ featureFlags.isFeatureEnabled.mockResolvedValue(false);
+
+ await sendWithAssistantOff(resolver);
+
+ expect(streaming.streamAgentChat).toHaveBeenCalled();
+ expect(streaming.saveMessageWithoutReply).not.toHaveBeenCalled();
+ });
+
it('adds the mentioned members once the message is sent', async () => {
const { resolver, threadService, streaming } = buildResolver();
const addParticipants = jest
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.ts
index 3f450624c57..35874c757b7 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
@@ -15,6 +15,7 @@ import {
import GraphQLJSON from 'graphql-type-json';
import { PermissionFlagType } from 'twenty-shared/constants';
import { isDefined, isNonEmptyString } from 'twenty-shared/utils';
+import { FeatureFlagKey } from 'twenty-shared/types';
import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';
import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
@@ -50,6 +51,7 @@ import { AiGraphqlApiExceptionInterceptor } from 'src/engine/metadata-modules/ai
import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
import { AgentTurnRecorderService } from 'src/engine/metadata-modules/ai/ai-history/services/agent-turn-recorder.service';
import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
+import { FeatureFlagService } from 'src/engine/core-modules/feature-flag/services/feature-flag.service';
@UseGuards(
AuthPrincipalGuard({
@@ -85,6 +87,7 @@ export class AgentChatResolver {
private readonly threadLifecycleService: AgentChatThreadLifecycleService,
private readonly turnRecorderService: AgentTurnRecorderService,
private readonly workspaceCacheService: WorkspaceCacheService,
+ private readonly featureFlagService: FeatureFlagService,
private readonly messageReactionService: AgentChatMessageReactionService,
) {}
@@ -208,6 +211,8 @@ export class AgentChatResolver {
@AuthUserWorkspaceId() userWorkspaceId: string,
@AuthWorkspaceMemberId() workspaceMemberId: string,
@AuthWorkspace() workspace: WorkspaceEntity,
+ @Args('shouldAssistantReply', { type: () => Boolean, nullable: true })
+ shouldAssistantReply?: boolean | null,
): Promise<SendChatMessageResultDTO> {
await this.threadService.createThreadIfMissing({
threadId,
@@ -225,6 +230,7 @@ export class AgentChatResolver {
userWorkspaceId,
workspaceMemberId,
workspace,
+ shouldAssistantReply: shouldAssistantReply ?? true,
});
const mentionedParticipantWorkspaceMemberIds =
@@ -248,6 +254,7 @@ export class AgentChatResolver {
userWorkspaceId,
workspaceMemberId,
workspace,
+ shouldAssistantReply,
}: {
threadId: string;
text: string;
@@ -258,15 +265,30 @@ export class AgentChatResolver {
userWorkspaceId: string;
workspaceMemberId: string;
workspace: WorkspaceEntity;
+ shouldAssistantReply: boolean;
}): Promise<SendChatMessageResultDTO> {
- const thread = await this.turnPreflightService.assertCanStartChatTurn({
+ const thread = await this.threadService.getWritableThread({
threadId,
- modelId,
- userWorkspaceId,
workspaceMemberId,
- workspace,
+ workspaceId: workspace.id,
});
+ const isAssistantReplying =
+ shouldAssistantReply ||
+ !(await this.featureFlagService.isFeatureEnabled(
+ FeatureFlagKey.IS_AI_CHAT_INBOX_ENABLED,
+ workspace.id,
+ ));
+
+ // Members can keep talking when the assistant cannot run
+ if (isAssistantReplying) {
+ await this.turnPreflightService.assertCanRunAgentTurn({
+ modelId,
+ userWorkspaceId,
+ workspace,
+ });
+ }
+
if (isDefined(thread.deletedAt)) {
await this.agentChatService.restoreThread({
threadId,
@@ -277,6 +299,21 @@ export class AgentChatResolver {
await this.reapDeadStream(thread, workspace.id);
+ if (!isAssistantReplying) {
+ const savedMessage =
+ await this.agentChatStreamingService.saveMessageWithoutReply({
+ thread,
+ userWorkspaceId,
+ workspaceMemberId,
+ workspace,
+ text,
+ messageId,
+ fileAttachments: fileAttachments ?? undefined,
+ });
+
+ return { messageId: savedMessage.messageId, queued: false };
+ }
+
if (isNonEmptyString(thread.activeStreamId)) {
const queuedMessage = await this.agentChatService.queueMessage({
threadId,
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.ts
index eba08f1939f..5e6746e8b03 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
@@ -237,6 +237,66 @@ export class AgentChatStreamingService {
);
}
+ saveMessageWithoutReply({
+ thread,
+ userWorkspaceId,
+ workspaceMemberId,
+ workspace,
+ text,
+ messageId,
+ fileAttachments,
+ }: Pick<
+ StreamAgentChatOptions,
+ | 'thread'
+ | 'userWorkspaceId'
+ | 'workspaceMemberId'
+ | 'workspace'
+ | 'text'
+ | 'messageId'
+ | 'fileAttachments'
+ >): Promise<{ messageId: string }> {
+ const threadId = thread.id;
+ const workspaceId = workspace.id;
+
+ return this.agentRunConversationService.withThreadLockForMessage({
+ workspaceId,
+ threadId,
+ work: async () => {
+ const fileParts = await this.buildFilePartsFromAttachments(
+ fileAttachments,
+ workspaceId,
+ );
+
+ const savedMessage = await this.agentChatService.addMessage({
+ threadId,
+ userWorkspaceId,
+ id: messageId,
+ uiMessage: {
+ role: AgentMessageRole.USER,
+ parts: [{ type: 'text' as const, text }, ...fileParts],
+ },
+ turnStatus: AgentTurnStatus.COMPLETED,
+ workspaceId,
+ });
+
+ await this.eventPublisherService.publish({
+ workspaceId,
+ threadId,
+ event: { type: 'message-added', messageId: savedMessage.id },
+ });
+
+ await this.threadService.notifyThreadActivityUpdated({
+ threadId,
+ workspaceMemberId,
+ workspaceId,
+ text,
+ });
+
+ return { messageId: savedMessage.id };
+ },
+ });
+ }
+
// the agent speaks first, from a context in place of a user message
async startOpeningTurn({
thread,
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-turn-preflight.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-turn-preflight.service.ts
index 766db3aeb09..0326afde074 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-turn-preflight.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-turn-preflight.service.ts
@@ -32,6 +32,40 @@ export class AgentChatTurnPreflightService {
workspaceMemberId: string;
workspace: WorkspaceEntity;
}) {
+ this.assertModelAvailable({ modelId, workspace });
+
+ const thread = await this.threadService.getWritableThread({
+ threadId,
+ workspaceMemberId,
+ workspaceId: workspace.id,
+ });
+
+ await this.assertAiExecutionAllowed({ userWorkspaceId, workspace });
+
+ return thread;
+ }
+
+ async assertCanRunAgentTurn({
+ modelId,
+ userWorkspaceId,
+ workspace,
+ }: {
+ modelId?: string;
+ userWorkspaceId: string;
+ workspace: WorkspaceEntity;
+ }): Promise<void> {
+ this.assertModelAvailable({ modelId, workspace });
+
+ await this.assertAiExecutionAllowed({ userWorkspaceId, workspace });
+ }
+
+ private assertModelAvailable({
+ modelId,
+ workspace,
+ }: {
+ modelId?: string;
+ workspace: WorkspaceEntity;
+ }): void {
if (this.aiModelRegistryService.getAvailableModels().length === 0) {
throw new AiException(
'No AI models are available. Configure at least one AI provider.',
@@ -42,19 +76,19 @@ export class AgentChatTurnPreflightService {
this.aiModelRegistryService.validateModelAvailability(
getChatModelId({ requestedModelId: modelId, workspace }),
);
+ }
- const thread = await this.threadService.getWritableThread({
- threadId,
- workspaceMemberId,
- workspaceId: workspace.id,
- });
-
+ private async assertAiExecutionAllowed({
+ userWorkspaceId,
+ workspace,
+ }: {
+ userWorkspaceId: string;
+ workspace: WorkspaceEntity;
+ }): Promise<void> {
await this.aiBillingService.assertAiExecutionAllowed({
workspaceId: workspace.id,
operationType: UsageOperationType.AI_CHAT_TOKEN,
spenders: { userWorkspaceId },
});
-
- return thread;
}
}
diff --git a/packages/twenty-shared/src/ai/constants/agent-chat-assistant-mention-object-name-singular.const.ts b/packages/twenty-shared/src/ai/constants/agent-chat-assistant-mention-object-name-singular.const.ts
new file mode 100644
index 00000000000..94ebae0b2c8
--- /dev/null
+++ b/packages/twenty-shared/src/ai/constants/agent-chat-assistant-mention-object-name-singular.const.ts
@@ -0,0 +1,2 @@
+export const AGENT_CHAT_ASSISTANT_MENTION_OBJECT_NAME_SINGULAR =
+ 'agentChatAssistant';
diff --git a/packages/twenty-shared/src/ai/index.ts b/packages/twenty-shared/src/ai/index.ts
index aa9f74a1914..fb1997123cc 100644
--- a/packages/twenty-shared/src/ai/index.ts
+++ b/packages/twenty-shared/src/ai/index.ts
@@ -7,6 +7,7 @@
* |___/
*/
+export { AGENT_CHAT_ASSISTANT_MENTION_OBJECT_NAME_SINGULAR } from './constants/agent-chat-assistant-mention-object-name-singular.const';
export { AGENT_MESSAGE_REACTION_EMOJI_MAX_LENGTH } from './constants/agent-message-reaction-emoji-max-length.const';
export type { AiEvaluationQuestionType } from './constants/ai-evaluation-question-type.const';
export { AI_EVALUATION_QUESTION_TYPES } from './constants/ai-evaluation-question-type.const';
diff --git a/packages/twenty-shared/src/ai/types/AgentChatSubscriptionEvent.ts b/packages/twenty-shared/src/ai/types/AgentChatSubscriptionEvent.ts
index 1e15e9ea58f..1785bfa0be0 100644
--- a/packages/twenty-shared/src/ai/types/AgentChatSubscriptionEvent.ts
+++ b/packages/twenty-shared/src/ai/types/AgentChatSubscriptionEvent.ts
@@ -4,6 +4,8 @@ import { type AgentMessageReactionSummary } from '@/ai/types/AgentMessageReactio
export type AgentChatSubscriptionEvent =
| { type: 'stream-chunk'; chunk: Record<string, unknown>; seq?: number }
| { type: 'message-persisted'; messageId: string }
+ // A message saved without a turn, which must not reset a reply in progress
+ | { type: 'message-added'; messageId: string }
| { type: 'queue-updated' }
| { type: 'tool-call-resolved'; toolCallId: string }
| {
diff --git a/packages/twenty-shared/src/ai/utils/__tests__/format-record-reference.util.spec.ts b/packages/twenty-shared/src/ai/utils/__tests__/format-record-reference.util.spec.ts
index 3dddcbcb22a..f032065cb29 100644
--- a/packages/twenty-shared/src/ai/utils/__tests__/format-record-reference.util.spec.ts
+++ b/packages/twenty-shared/src/ai/utils/__tests__/format-record-reference.util.spec.ts
@@ -1,3 +1,4 @@
+import { AGENT_CHAT_ASSISTANT_MENTION_OBJECT_NAME_SINGULAR } from '@/ai/constants/agent-chat-assistant-mention-object-name-singular.const';
import { formatRecordReference } from '@/ai/utils/format-record-reference.util';
describe('formatRecordReference', () => {
@@ -10,4 +11,14 @@ describe('formatRecordReference', () => {
}),
).toBe('[[record:company:record-id:Acme Corp]]');
});
+
+ it('writes a mention of the assistant as plain text', () => {
+ expect(
+ formatRecordReference({
+ objectNameSingular: AGENT_CHAT_ASSISTANT_MENTION_OBJECT_NAME_SINGULAR,
+ recordId: 'assistant',
+ displayName: 'Ada',
+ }),
+ ).toBe('@Ada');
+ });
});
diff --git a/packages/twenty-shared/src/ai/utils/format-record-reference.util.ts b/packages/twenty-shared/src/ai/utils/format-record-reference.util.ts
index 710ffe00e8c..6dd38003c37 100644
--- a/packages/twenty-shared/src/ai/utils/format-record-reference.util.ts
+++ b/packages/twenty-shared/src/ai/utils/format-record-reference.util.ts
@@ -1,3 +1,5 @@
+import { AGENT_CHAT_ASSISTANT_MENTION_OBJECT_NAME_SINGULAR } from '../constants/agent-chat-assistant-mention-object-name-singular.const';
+
export const formatRecordReference = ({
objectNameSingular,
recordId,
@@ -6,4 +8,7 @@ export const formatRecordReference = ({
objectNameSingular: string;
recordId: string;
displayName: string;
-}): string => `[[record:${objectNameSingular}:${recordId}:${displayName}]]`;
+}): string =>
+ objectNameSingular === AGENT_CHAT_ASSISTANT_MENTION_OBJECT_NAME_SINGULAR
+ ? `@${displayName}`
+ : `[[record:${objectNameSingular}:${recordId}:${displayName}]]`;