Skip to content

The open alternative to Salesforce, designed for AI.

[BREAKING_CHANGE] chore: remove the compatibility code kept for the 2.44 rollout (#27021)

Félix Malfaitd68f4a7d01e1
diff --git a/packages/twenty-client-sdk/src/metadata/generated/schema.graphql b/packages/twenty-client-sdk/src/metadata/generated/schema.graphql
index 912d30b79cf..afd4ef16f20 100644
--- a/packages/twenty-client-sdk/src/metadata/generated/schema.graphql
+++ b/packages/twenty-client-sdk/src/metadata/generated/schema.graphql
@@ -2078,7 +2078,6 @@ enum FeatureFlagKey {
IS_REST_METADATA_API_NEW_FORMAT_DIRECT
IS_LOGIC_FUNCTION_PREBUILT_MODE_ENABLED
IS_WORKFLOW_CORE_INDEX_PAGE_ENABLED
- IS_RECORD_SHARING_ENABLED
IS_AI_CHAT_SHARING_DROPDOWN_ENABLED
IS_INITIAL_OBJECT_VIEW_ENABLED
IS_WEBHOOK_RATE_LIMIT_ENABLED
@@ -4355,7 +4354,6 @@ type Mutation {
startChannelSync(connectedAccountId: UUID!): ChannelSyncSuccess!
saveImapSmtpCaldavAccount(handle: String!, connectionParameters: EmailAccountConnectionParameters!, id: UUID): ImapSmtpCaldavConnectionSuccess!
updateLabPublicFeatureFlag(input: UpdateLabPublicFeatureFlagInput!): FeatureFlag!
- answerAgentChatQuestion(threadId: UUID!, messageId: UUID!, answers: [AgentChatQuestionAnswerInput!]!, modelId: String, fileAttachments: [FileAttachmentInput!]): SendChatMessageResult! @deprecated(reason: "Use answerToolCall with the questions tool call")
createPublicDomain(domain: String!, applicationId: String!): PublicDomain!
deletePublicDomain(domain: String!): Boolean!
checkPublicDomainValidRecords(domain: String!): DomainValidRecords
@@ -5727,12 +5725,6 @@ input UpdateLabPublicFeatureFlagInput {
value: Boolean!
}
-input AgentChatQuestionAnswerInput {
- questionIndex: Int!
- selectedOptionIndices: [Int!]!
- freeText: String
-}
-
input ApplicationFileUploadRequestInput {
fileFolder: FileFolder!
filePath: String!
diff --git a/packages/twenty-client-sdk/src/metadata/generated/schema.ts b/packages/twenty-client-sdk/src/metadata/generated/schema.ts
index fcdaec05471..4432c72aee4 100644
--- a/packages/twenty-client-sdk/src/metadata/generated/schema.ts
+++ b/packages/twenty-client-sdk/src/metadata/generated/schema.ts
@@ -1683,7 +1683,7 @@ export interface FeatureFlag {
__typename: 'FeatureFlag'
}
-export type FeatureFlagKey = 'IS_ASYNC_CSV_EXPORT_ENABLED' | 'IS_UNIQUE_INDEXES_ENABLED' | 'IS_CONFIGURABLE_SEARCH_FIELDS_ENABLED' | 'IS_JSON_FILTER_ENABLED' | 'IS_MESSAGE_CAMPAIGN_ENABLED' | 'IS_JUNCTION_RELATIONS_ENABLED' | 'IS_REST_METADATA_API_NEW_FORMAT_DIRECT' | 'IS_LOGIC_FUNCTION_PREBUILT_MODE_ENABLED' | 'IS_WORKFLOW_CORE_INDEX_PAGE_ENABLED' | 'IS_RECORD_SHARING_ENABLED' | 'IS_AI_CHAT_SHARING_DROPDOWN_ENABLED' | 'IS_INITIAL_OBJECT_VIEW_ENABLED' | 'IS_WEBHOOK_RATE_LIMIT_ENABLED' | 'IS_DEFERRED_WORKSPACE_MIGRATION_ACTIONS_ENABLED' | 'IS_EXECUTION_QUOTA_ENABLED' | 'IS_RECORD_CREATION_FORM_ENABLED' | 'IS_LOGS_SETTINGS_SECTION_ENABLED' | 'IS_CONVERSATIONS_TAB_ENABLED' | 'IS_VALIDATION_RULES_ENABLED'
+export type FeatureFlagKey = 'IS_ASYNC_CSV_EXPORT_ENABLED' | 'IS_UNIQUE_INDEXES_ENABLED' | 'IS_CONFIGURABLE_SEARCH_FIELDS_ENABLED' | 'IS_JSON_FILTER_ENABLED' | 'IS_MESSAGE_CAMPAIGN_ENABLED' | 'IS_JUNCTION_RELATIONS_ENABLED' | 'IS_REST_METADATA_API_NEW_FORMAT_DIRECT' | 'IS_LOGIC_FUNCTION_PREBUILT_MODE_ENABLED' | 'IS_WORKFLOW_CORE_INDEX_PAGE_ENABLED' | 'IS_AI_CHAT_SHARING_DROPDOWN_ENABLED' | 'IS_INITIAL_OBJECT_VIEW_ENABLED' | 'IS_WEBHOOK_RATE_LIMIT_ENABLED' | 'IS_DEFERRED_WORKSPACE_MIGRATION_ACTIONS_ENABLED' | 'IS_EXECUTION_QUOTA_ENABLED' | 'IS_RECORD_CREATION_FORM_ENABLED' | 'IS_LOGS_SETTINGS_SECTION_ENABLED' | 'IS_CONVERSATIONS_TAB_ENABLED' | 'IS_VALIDATION_RULES_ENABLED'
export interface WorkspaceUrls {
customUrl?: Scalars['String']
@@ -3748,8 +3748,6 @@ export interface Mutation {
startChannelSync: ChannelSyncSuccess
saveImapSmtpCaldavAccount: ImapSmtpCaldavConnectionSuccess
updateLabPublicFeatureFlag: FeatureFlag
- /** @deprecated Use answerToolCall with the questions tool call */
- answerAgentChatQuestion: SendChatMessageResult
createPublicDomain: PublicDomain
deletePublicDomain: Scalars['Boolean']
checkPublicDomainValidRecords?: DomainValidRecords
@@ -7723,8 +7721,6 @@ export interface MutationGenqlSelection{
startChannelSync?: (ChannelSyncSuccessGenqlSelection & { __args: {connectedAccountId: Scalars['UUID']} })
saveImapSmtpCaldavAccount?: (ImapSmtpCaldavConnectionSuccessGenqlSelection & { __args: {handle: Scalars['String'], connectionParameters: EmailAccountConnectionParameters, id?: (Scalars['UUID'] | null)} })
updateLabPublicFeatureFlag?: (FeatureFlagGenqlSelection & { __args: {input: UpdateLabPublicFeatureFlagInput} })
- /** @deprecated Use answerToolCall with the questions tool call */
- answerAgentChatQuestion?: (SendChatMessageResultGenqlSelection & { __args: {threadId: Scalars['UUID'], messageId: Scalars['UUID'], answers: AgentChatQuestionAnswerInput[], modelId?: (Scalars['String'] | null), fileAttachments?: (FileAttachmentInput[] | null)} })
createPublicDomain?: (PublicDomainGenqlSelection & { __args: {domain: Scalars['String'], applicationId: Scalars['String']} })
deletePublicDomain?: { __args: {domain: Scalars['String']} }
checkPublicDomainValidRecords?: (DomainValidRecordsGenqlSelection & { __args: {domain: Scalars['String']} })
@@ -8180,8 +8176,6 @@ export interface ConnectionParametersInput {host: Scalars['String'],port: Scalar
export interface UpdateLabPublicFeatureFlagInput {publicFeatureFlag: Scalars['String'],value: Scalars['Boolean']}
-export interface AgentChatQuestionAnswerInput {questionIndex: Scalars['Int'],selectedOptionIndices: Scalars['Int'][],freeText?: (Scalars['String'] | null)}
-
export interface ApplicationFileUploadRequestInput {fileFolder: FileFolder,filePath: Scalars['String'],size: Scalars['Int']}
export interface SubscriptionGenqlSelection{
@@ -11286,7 +11280,6 @@ export const enumFeatureFlagKey = {
IS_REST_METADATA_API_NEW_FORMAT_DIRECT: 'IS_REST_METADATA_API_NEW_FORMAT_DIRECT' as const,
IS_LOGIC_FUNCTION_PREBUILT_MODE_ENABLED: 'IS_LOGIC_FUNCTION_PREBUILT_MODE_ENABLED' as const,
IS_WORKFLOW_CORE_INDEX_PAGE_ENABLED: 'IS_WORKFLOW_CORE_INDEX_PAGE_ENABLED' as const,
- IS_RECORD_SHARING_ENABLED: 'IS_RECORD_SHARING_ENABLED' as const,
IS_AI_CHAT_SHARING_DROPDOWN_ENABLED: 'IS_AI_CHAT_SHARING_DROPDOWN_ENABLED' as const,
IS_INITIAL_OBJECT_VIEW_ENABLED: 'IS_INITIAL_OBJECT_VIEW_ENABLED' as const,
IS_WEBHOOK_RATE_LIMIT_ENABLED: 'IS_WEBHOOK_RATE_LIMIT_ENABLED' as const,
diff --git a/packages/twenty-client-sdk/src/metadata/generated/types.ts b/packages/twenty-client-sdk/src/metadata/generated/types.ts
index dee2244eee8..a924e8c02cf 100644
--- a/packages/twenty-client-sdk/src/metadata/generated/types.ts
+++ b/packages/twenty-client-sdk/src/metadata/generated/types.ts
@@ -11247,30 +11247,6 @@ export default {
]
}
],
- "answerAgentChatQuestion": [
- 382,
- {
- "threadId": [
- 3,
- "UUID!"
- ],
- "messageId": [
- 3,
- "UUID!"
- ],
- "answers": [
- 609,
- "[AgentChatQuestionAnswerInput!]!"
- ],
- "modelId": [
- 1
- ],
- "fileAttachments": [
- 588,
- "[FileAttachmentInput!]"
- ]
- }
- ],
"createPublicDomain": [
325,
{
@@ -11359,7 +11335,7 @@ export default {
"String!"
],
"files": [
- 610,
+ 609,
"[ApplicationFileUploadRequestInput!]!"
]
}
@@ -14460,20 +14436,6 @@ export default {
1
]
},
- "AgentChatQuestionAnswerInput": {
- "questionIndex": [
- 30
- ],
- "selectedOptionIndices": [
- 30
- ],
- "freeText": [
- 1
- ],
- "__typename": [
- 1
- ]
- },
"ApplicationFileUploadRequestInput": {
"fileFolder": [
320
@@ -14502,7 +14464,7 @@ export default {
286,
{
"input": [
- 612,
+ 611,
"LogicFunctionLogsInput!"
]
}
@@ -14533,7 +14495,7 @@ export default {
391,
{
"input": [
- 613,
+ 612,
"CreateRecordExportInput!"
]
}
diff --git a/packages/twenty-front/src/generated-admin/graphql.ts b/packages/twenty-front/src/generated-admin/graphql.ts
index d7e1481e59c..212889f30bd 100644
--- a/packages/twenty-front/src/generated-admin/graphql.ts
+++ b/packages/twenty-front/src/generated-admin/graphql.ts
@@ -488,7 +488,6 @@ export enum FeatureFlagKey {
IS_LOGS_SETTINGS_SECTION_ENABLED = 'IS_LOGS_SETTINGS_SECTION_ENABLED',
IS_MESSAGE_CAMPAIGN_ENABLED = 'IS_MESSAGE_CAMPAIGN_ENABLED',
IS_RECORD_CREATION_FORM_ENABLED = 'IS_RECORD_CREATION_FORM_ENABLED',
- IS_RECORD_SHARING_ENABLED = 'IS_RECORD_SHARING_ENABLED',
IS_REST_METADATA_API_NEW_FORMAT_DIRECT = 'IS_REST_METADATA_API_NEW_FORMAT_DIRECT',
IS_UNIQUE_INDEXES_ENABLED = 'IS_UNIQUE_INDEXES_ENABLED',
IS_VALIDATION_RULES_ENABLED = 'IS_VALIDATION_RULES_ENABLED',
diff --git a/packages/twenty-front/src/generated-metadata/graphql.ts b/packages/twenty-front/src/generated-metadata/graphql.ts
index 92fbceca559..3a78d0c2693 100644
--- a/packages/twenty-front/src/generated-metadata/graphql.ts
+++ b/packages/twenty-front/src/generated-metadata/graphql.ts
@@ -58,12 +58,6 @@ export type AgentChatEvent = {
threadId: Scalars['String']['output'];
};
-export type AgentChatQuestionAnswerInput = {
- freeText?: InputMaybe<Scalars['String']['input']>;
- questionIndex: Scalars['Int']['input'];
- selectedOptionIndices: Array<Scalars['Int']['input']>;
-};
-
export type AgentChatThread = {
__typename?: 'AgentChatThread';
contextWindowTokens?: Maybe<Scalars['Int']['output']>;
@@ -2149,7 +2143,6 @@ export enum FeatureFlagKey {
IS_LOGS_SETTINGS_SECTION_ENABLED = 'IS_LOGS_SETTINGS_SECTION_ENABLED',
IS_MESSAGE_CAMPAIGN_ENABLED = 'IS_MESSAGE_CAMPAIGN_ENABLED',
IS_RECORD_CREATION_FORM_ENABLED = 'IS_RECORD_CREATION_FORM_ENABLED',
- IS_RECORD_SHARING_ENABLED = 'IS_RECORD_SHARING_ENABLED',
IS_REST_METADATA_API_NEW_FORMAT_DIRECT = 'IS_REST_METADATA_API_NEW_FORMAT_DIRECT',
IS_UNIQUE_INDEXES_ENABLED = 'IS_UNIQUE_INDEXES_ENABLED',
IS_VALIDATION_RULES_ENABLED = 'IS_VALIDATION_RULES_ENABLED',
@@ -3060,8 +3053,6 @@ export type Mutation = {
activateSkill: Skill;
activateWorkspace: Workspace;
addQueryToEventStream: Scalars['Boolean']['output'];
- /** @deprecated Use answerToolCall with the questions tool call */
- answerAgentChatQuestion: SendChatMessageResult;
assignRoleToAgent: Scalars['Boolean']['output'];
assignRoleToApiKey: Scalars['Boolean']['output'];
authorizeApp: AuthorizeApp;
@@ -3347,15 +3338,6 @@ 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'];
-};
-
-
export type MutationAssignRoleToAgentArgs = {
agentId: Scalars['UUID']['input'];
roleId: Scalars['UUID']['input'];
@@ -7898,8 +7880,6 @@ export type FindManyTimelineActivityTypesQueryVariables = Exact<{ [key: string]:
export type FindManyTimelineActivityTypesQuery = { __typename?: 'Query', timelineActivityTypes: Array<{ __typename?: 'TimelineActivityType', id: string, applicationId?: string | null, universalIdentifier: string, name: string, label: string, icon?: string | null, frontComponentUniversalIdentifier?: string | null, isActive: boolean, emit?: { __typename?: 'TimelineActivityTypeEmit', on: string, objectUniversalIdentifier?: string | null } | null }> };
-export type AgentChatThreadFieldsFragment = { __typename?: 'AgentChatThread', id: string, title?: string | null, totalCacheReadTokens: number, totalInputTokens: number, totalOutputTokens: number, contextWindowTokens?: number | null, conversationSize: number, totalInputCredits: number, totalOutputCredits: number, deletedAt?: string | null, createdAt: string, updatedAt: string };
-
export type AgentFieldsFragment = { __typename?: 'Agent', id: string, name: string, label: string, description?: string | null, icon?: string | null, prompt: string, modelId: string, responseFormat?: any | null, roleId?: string | null, isCustom: boolean, modelConfiguration?: any | null, evaluationInputs: Array<string>, applicationId?: string | null, createdAt: string, updatedAt: string };
export type SkillFieldsFragment = { __typename?: 'Skill', id: string, name: string, label: string, description?: string | null, icon?: string | null, content: string, isCustom: boolean, isSystem: boolean, isActive: boolean, applicationId?: string | null, createdAt: string, updatedAt: string };
@@ -10465,7 +10445,6 @@ export type FindManyMarketplaceAppsForToolTableQueryVariables = Exact<{ [key: st
export type FindManyMarketplaceAppsForToolTableQuery = { __typename?: 'Query', findManyMarketplaceApps: Array<{ __typename?: 'MarketplaceApp', id: string, logoUrl?: string | null }> };
-export const AgentChatThreadFieldsFragmentDoc = {"kind":"Document","definitions":[{"kind":"FragmentDefinition","name":{"kind":"Name","value":"AgentChatThreadFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"AgentChatThread"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"totalCacheReadTokens"}},{"kind":"Field","name":{"kind":"Name","value":"totalInputTokens"}},{"kind":"Field","name":{"kind":"Name","value":"totalOutputTokens"}},{"kind":"Field","name":{"kind":"Name","value":"contextWindowTokens"}},{"kind":"Field","name":{"kind":"Name","value":"conversationSize"}},{"kind":"Field","name":{"kind":"Name","value":"totalInputCredits"}},{"kind":"Field","name":{"kind":"Name","value":"totalOutputCredits"}},{"kind":"Field","name":{"kind":"Name","value":"deletedAt"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}}]} as unknown as DocumentNode<AgentChatThreadFieldsFragment, unknown>;
export const SkillFieldsFragmentDoc = {"kind":"Document","definitions":[{"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<SkillFieldsFragment, unknown>;
export const AgentFieldsFragmentDoc = {"kind":"Document","definitions":[{"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":"modelConfiguration"}},{"kind":"Field","name":{"kind":"Name","value":"evaluationInputs"}},{"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<AgentFieldsFragment, unknown>;
export const ObjectMetadataFieldsFragmentDoc = {"kind":"Document","definitions":[{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ObjectMetadataFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Object"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"universalIdentifier"}},{"kind":"Field","name":{"kind":"Name","value":"nameSingular"}},{"kind":"Field","name":{"kind":"Name","value":"namePlural"}},{"kind":"Field","name":{"kind":"Name","value":"labelSingular"}},{"kind":"Field","name":{"kind":"Name","value":"labelPlural"}},{"kind":"Field","name":{"kind":"Name","value":"color"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"icon"}},{"kind":"Field","name":{"kind":"Name","value":"isRemote"}},{"kind":"Field","name":{"kind":"Name","value":"isActive"}},{"kind":"Field","name":{"kind":"Name","value":"isSystem"}},{"kind":"Field","name":{"kind":"Name","value":"isUIEditable"}},{"kind":"Field","name":{"kind":"Name","value":"isUICreatable"}},{"kind":"Field","name":{"kind":"Name","value":"writability"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}},{"kind":"Field","name":{"kind":"Name","value":"labelIdentifierFieldMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"imageIdentifierFieldMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"applicationId"}},{"kind":"Field","name":{"kind":"Name","value":"shortcut"}},{"kind":"Field","name":{"kind":"Name","value":"isLabelSyncedWithName"}},{"kind":"Field","name":{"kind":"Name","value":"isSearchable"}},{"kind":"Field","name":{"kind":"Name","value":"openRecordIn"}},{"kind":"Field","name":{"kind":"Name","value":"duplicateCriteria"}},{"kind":"Field","name":{"kind":"Name","value":"searchFieldMetadataList"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"fieldMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"tsVectorFieldMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"position"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}},{"kind":"Field","name":{"kind":"Name","value":"indexMetadataList"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"indexWhereClause"}},{"kind":"Field","name":{"kind":"Name","value":"indexType"}},{"kind":"Field","name":{"kind":"Name","value":"isUnique"}},{"kind":"Field","name":{"kind":"Name","value":"isCustom"}},{"kind":"Field","name":{"kind":"Name","value":"indexFieldMetadataList"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"fieldMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"subFieldName"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}},{"kind":"Field","name":{"kind":"Name","value":"order"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"fieldsList"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"universalIdentifier"}},{"kind":"Field","name":{"kind":"Name","value":"type"}},{"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":"isActive"}},{"kind":"Field","name":{"kind":"Name","value":"isSystem"}},{"kind":"Field","name":{"kind":"Name","value":"isUIEditable"}},{"kind":"Field","name":{"kind":"Name","value":"writability"}},{"kind":"Field","name":{"kind":"Name","value":"isNullable"}},{"kind":"Field","name":{"kind":"Name","value":"isUnique"}},{"kind":"Field","name":{"kind":"Name","value":"isSearchable"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}},{"kind":"Field","name":{"kind":"Name","value":"defaultValue"}},{"kind":"Field","name":{"kind":"Name","value":"options"}},{"kind":"Field","name":{"kind":"Name","value":"settings"}},{"kind":"Field","name":{"kind":"Name","value":"isLabelSyncedWithName"}},{"kind":"Field","name":{"kind":"Name","value":"morphId"}},{"kind":"Field","name":{"kind":"Name","value":"applicationId"}},{"kind":"Field","name":{"kind":"Name","value":"relation"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"type"}},{"kind":"Field","name":{"kind":"Name","value":"sourceObjectMetadata"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"nameSingular"}},{"kind":"Field","name":{"kind":"Name","value":"namePlural"}}]}},{"kind":"Field","name":{"kind":"Name","value":"targetObjectMetadata"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"nameSingular"}},{"kind":"Field","name":{"kind":"Name","value":"namePlural"}}]}},{"kind":"Field","name":{"kind":"Name","value":"sourceFieldMetadata"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}},{"kind":"Field","name":{"kind":"Name","value":"targetFieldMetadata"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"morphRelations"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"type"}},{"kind":"Field","name":{"kind":"Name","value":"sourceObjectMetadata"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"nameSingular"}},{"kind":"Field","name":{"kind":"Name","value":"namePlural"}}]}},{"kind":"Field","name":{"kind":"Name","value":"targetObjectMetadata"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"nameSingular"}},{"kind":"Field","name":{"kind":"Name","value":"namePlural"}}]}},{"kind":"Field","name":{"kind":"Name","value":"sourceFieldMetadata"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}},{"kind":"Field","name":{"kind":"Name","value":"targetFieldMetadata"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}}]}}]}}]}}]} as unknown as DocumentNode<ObjectMetadataFieldsFragment, unknown>;
diff --git a/packages/twenty-front/src/generated/graphql.ts b/packages/twenty-front/src/generated/graphql.ts
index 4ee4eae49a3..4affd13d390 100644
--- a/packages/twenty-front/src/generated/graphql.ts
+++ b/packages/twenty-front/src/generated/graphql.ts
@@ -461,8 +461,6 @@ export type Mutation = {
runCoreWorkflowVersion: RunWorkflowVersion;
runWorkflowVersion: RunWorkflowVersion;
stopWorkflowRun: WorkflowRun;
- /** @deprecated Use answerToolCall with the step's thread and the step id as toolCallId */
- submitFormStep: Scalars['Boolean']['output'];
testHttpRequest: TestHttpRequest;
updateCoreWorkflow?: Maybe<CoreWorkflowDto>;
updateCoreWorkflowVersionPositions: Scalars['Boolean']['output'];
@@ -622,11 +620,6 @@ export type MutationStopWorkflowRunArgs = {
};
-export type MutationSubmitFormStepArgs = {
- input: SubmitFormStepInput;
-};
-
-
export type MutationTestHttpRequestArgs = {
input: TestHttpRequestInput;
};
@@ -897,15 +890,6 @@ export type SearchResultPageInfo = {
hasNextPage: Scalars['Boolean']['output'];
};
-export type SubmitFormStepInput = {
- /** Form response in JSON format */
- response: Scalars['JSON']['input'];
- /** Workflow step ID */
- stepId: Scalars['UUID']['input'];
- /** Workflow run ID */
- workflowRunId: Scalars['UUID']['input'];
-};
-
export type TestHttpRequest = {
__typename?: 'TestHttpRequest';
/** Error information */
@@ -1509,13 +1493,6 @@ export type StopWorkflowRunMutationVariables = Exact<{
export type StopWorkflowRunMutation = { __typename?: 'Mutation', stopWorkflowRun: { __typename: 'WorkflowRun', id: any, status: WorkflowRunStatusEnum } };
-export type SubmitFormStepMutationVariables = Exact<{
- input: SubmitFormStepInput;
-}>;
-
-
-export type SubmitFormStepMutation = { __typename?: 'Mutation', submitFormStep: boolean };
-
export type UpdateWorkflowRunStepMutationVariables = Exact<{
input: UpdateWorkflowRunStepInput;
}>;
@@ -1615,7 +1592,6 @@ export const DuplicateWorkflowVersionStepDocument = {"kind":"Document","definiti
export const RetryWorkflowRunDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"RetryWorkflowRun"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"workflowRunId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"retryWorkflowRun"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"workflowRunId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"workflowRunId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"status"}},{"kind":"Field","name":{"kind":"Name","value":"__typename"}}]}}]}}]} as unknown as DocumentNode<RetryWorkflowRunMutation, RetryWorkflowRunMutationVariables>;
export const RunWorkflowVersionDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"RunWorkflowVersion"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"RunWorkflowVersionInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"runWorkflowVersion"},"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":"workflowRunId"}}]}}]}}]} as unknown as DocumentNode<RunWorkflowVersionMutation, RunWorkflowVersionMutationVariables>;
export const StopWorkflowRunDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"StopWorkflowRun"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"workflowRunId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"stopWorkflowRun"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"workflowRunId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"workflowRunId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"status"}},{"kind":"Field","name":{"kind":"Name","value":"__typename"}}]}}]}}]} as unknown as DocumentNode<StopWorkflowRunMutation, StopWorkflowRunMutationVariables>;
-export const SubmitFormStepDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"SubmitFormStep"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"SubmitFormStepInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"submitFormStep"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}]}]}}]} as unknown as DocumentNode<SubmitFormStepMutation, SubmitFormStepMutationVariables>;
export const UpdateWorkflowRunStepDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpdateWorkflowRunStep"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UpdateWorkflowRunStepInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"updateWorkflowRunStep"},"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":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"type"}},{"kind":"Field","name":{"kind":"Name","value":"settings"}},{"kind":"Field","name":{"kind":"Name","value":"valid"}},{"kind":"Field","name":{"kind":"Name","value":"nextStepIds"}},{"kind":"Field","name":{"kind":"Name","value":"position"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"x"}},{"kind":"Field","name":{"kind":"Name","value":"y"}}]}}]}}]}}]} as unknown as DocumentNode<UpdateWorkflowRunStepMutation, UpdateWorkflowRunStepMutationVariables>;
export const UpdateWorkflowVersionStepDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpdateWorkflowVersionStep"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UpdateWorkflowVersionStepInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"updateWorkflowVersionStep"},"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":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"type"}},{"kind":"Field","name":{"kind":"Name","value":"settings"}},{"kind":"Field","name":{"kind":"Name","value":"valid"}},{"kind":"Field","name":{"kind":"Name","value":"nextStepIds"}},{"kind":"Field","name":{"kind":"Name","value":"position"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"x"}},{"kind":"Field","name":{"kind":"Name","value":"y"}}]}}]}}]}}]} as unknown as DocumentNode<UpdateWorkflowVersionStepMutation, UpdateWorkflowVersionStepMutationVariables>;
export const UpdateWorkflowVersionTriggerDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpdateWorkflowVersionTrigger"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UpdateWorkflowVersionTriggerInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"updateWorkflowVersionTrigger"},"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":"trigger"}}]}}]}}]} as unknown as DocumentNode<UpdateWorkflowVersionTriggerMutation, UpdateWorkflowVersionTriggerMutationVariables>;
diff --git a/packages/twenty-front/src/modules/ai/components/AiChatPageHeader.tsx b/packages/twenty-front/src/modules/ai/components/AiChatPageHeader.tsx
index 50dd73853ba..046b5d0d776 100644
--- a/packages/twenty-front/src/modules/ai/components/AiChatPageHeader.tsx
+++ b/packages/twenty-front/src/modules/ai/components/AiChatPageHeader.tsx
@@ -1,28 +1,16 @@
import { useLingui } from '@lingui/react/macro';
-import { isDefined } from 'twenty-shared/utils';
import { useIsMobile } from 'twenty-ui/utilities';
import { AiChatCloseButton } from '@/ai/components/AiChatCloseButton';
-import { currentAiChatThreadState } from '@/ai/states/currentAiChatThreadState';
-import { currentAiChatThreadDataSelector } from '@/ai/states/selectors/currentAiChatThreadDataSelector';
import { PageCardHeader } from '@/ui/layout/page/components/PageCardHeader';
-import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
export const AiChatPageHeader = () => {
const { t } = useLingui();
const isMobile = useIsMobile();
- const currentAiChatThread = useAtomStateValue(currentAiChatThreadState);
- const currentAiChatThreadData = useAtomStateValue(
- currentAiChatThreadDataSelector,
- );
return (
<PageCardHeader
- title={
- isDefined(currentAiChatThread)
- ? (currentAiChatThreadData?.title ?? t`Chat`)
- : t`New chat`
- }
+ title={t`New chat`}
actionButton={isMobile ? <AiChatCloseButton /> : undefined}
/>
);
diff --git a/packages/twenty-front/src/modules/ai/components/__tests__/AiChatPageHeader.test.tsx b/packages/twenty-front/src/modules/ai/components/__tests__/AiChatPageHeader.test.tsx
index 8a81baede63..f46c752f751 100644
--- a/packages/twenty-front/src/modules/ai/components/__tests__/AiChatPageHeader.test.tsx
+++ b/packages/twenty-front/src/modules/ai/components/__tests__/AiChatPageHeader.test.tsx
@@ -1,14 +1,6 @@
import { i18n } from '@lingui/core';
import { I18nProvider } from '@lingui/react';
import { render, screen } from '@testing-library/react';
-import { Provider } from 'jotai';
-import { currentAiChatThreadState } from '@/ai/states/currentAiChatThreadState';
-import { agentChatThreadListState } from '@/ai/states/agentChatThreadListState';
-import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState';
-import {
- jotaiStore,
- resetJotaiStore,
-} from '@/ui/utilities/state/jotai/jotaiStore';
import { type ReactNode } from 'react';
import { SOURCE_LOCALE } from 'twenty-shared/translations';
@@ -23,32 +15,6 @@ jest.mock('@/ui/layout/page/components/PageCardHeader', () => ({
}));
describe('AiChatPageHeader', () => {
- beforeEach(() => resetJotaiStore());
-
- it('keeps the saved conversation title on the default chat surface', () => {
- jotaiStore.set(currentAiChatThreadState.atom, 'thread-id');
- jotaiStore.set(agentChatThreadListState.atom, {
- threadIds: ['thread-id'],
- hasNextPage: false,
- endCursor: null,
- });
- jotaiStore.set(recordStoreFamilyState.atomFamily('thread-id'), {
- id: 'thread-id',
- __typename: 'AgentChatThread',
- title: 'Existing conversation',
- });
-
- render(
- <Provider store={jotaiStore}>
- <I18nProvider i18n={i18n}>
- <AiChatPageHeader />
- </I18nProvider>
- </Provider>,
- );
-
- expect(screen.getByText('Existing conversation')).toBeVisible();
- });
-
it('titles the page of a chat that has no record yet', () => {
render(
<I18nProvider i18n={i18n}>
diff --git a/packages/twenty-front/src/modules/ai/graphql/fragments/agentChatThreadFragment.ts b/packages/twenty-front/src/modules/ai/graphql/fragments/agentChatThreadFragment.ts
deleted file mode 100644
index 974089134bd..00000000000
--- a/packages/twenty-front/src/modules/ai/graphql/fragments/agentChatThreadFragment.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { gql } from '@apollo/client';
-
-export const AGENT_CHAT_THREAD_FRAGMENT = gql`
- fragment AgentChatThreadFields on AgentChatThread {
- id
- title
- totalCacheReadTokens
- totalInputTokens
- totalOutputTokens
- contextWindowTokens
- conversationSize
- totalInputCredits
- totalOutputCredits
- deletedAt
- createdAt
- updatedAt
- }
-`;
diff --git a/packages/twenty-front/src/modules/workflow/graphql/mutations/submitFormStep.ts b/packages/twenty-front/src/modules/workflow/graphql/mutations/submitFormStep.ts
deleted file mode 100644
index a8ad41b7718..00000000000
--- a/packages/twenty-front/src/modules/workflow/graphql/mutations/submitFormStep.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { gql } from '@apollo/client';
-
-export const SUBMIT_FORM_STEP = gql`
- mutation SubmitFormStep($input: SubmitFormStepInput!) {
- submitFormStep(input: $input)
- }
-`;
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/form-action/components/__stories__/WorkflowFormStepSubmitButton.stories.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/form-action/components/__stories__/WorkflowFormStepSubmitButton.stories.tsx
index babff67d2c7..84169a9f9e3 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/form-action/components/__stories__/WorkflowFormStepSubmitButton.stories.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/form-action/components/__stories__/WorkflowFormStepSubmitButton.stories.tsx
@@ -46,13 +46,7 @@ const FormSubmission = () => {
);
};
-const createHandlers = ({
- threadId,
- errorCode,
-}: {
- threadId?: string;
- errorCode?: string;
-} = {}) => [
+const createHandlers = ({ errorCode }: { errorCode?: string } = {}) => [
graphql.query('FindOneWorkflowRun', () =>
HttpResponse.json({
data: {
@@ -68,13 +62,15 @@ const createHandlers = ({
},
state: {
...oneSucceededWorkflowRunQueryResult.workflowRun.state,
- stepInfos: { [STEP_ID]: { status: 'PENDING', threadId } },
+ stepInfos: {
+ [STEP_ID]: { status: 'PENDING', threadId: THREAD_ID },
+ },
},
},
},
}),
),
- graphql.mutation(threadId ? 'AnswerToolCall' : 'SubmitFormStep', () =>
+ graphql.mutation('AnswerToolCall', () =>
HttpResponse.json(
errorCode
? {
@@ -89,14 +85,12 @@ const createHandlers = ({
],
}
: {
- data: threadId
- ? {
- answerToolCall: {
- __typename: 'AnswerToolCallResult',
- streamId: null,
- },
- }
- : { submitFormStep: true },
+ data: {
+ answerToolCall: {
+ __typename: 'AnswerToolCallResult',
+ streamId: null,
+ },
+ },
},
),
),
@@ -125,7 +119,7 @@ const meta: Meta<typeof FormSubmission> = {
export default meta;
type Story = StoryObj<typeof FormSubmission>;
-export const WithoutConversation: Story = {
+export const Submitted: Story = {
play: async ({ canvasElement }) => {
const canvas = within(canvasElement);
@@ -136,11 +130,6 @@ export const WithoutConversation: Story = {
},
};
-export const WithConversation: Story = {
- parameters: { msw: { handlers: createHandlers({ threadId: THREAD_ID }) } },
- play: WithoutConversation.play,
-};
-
export const NoLongerPending: Story = {
parameters: {
msw: { handlers: createHandlers({ errorCode: 'TOOL_CALL_NOT_PENDING' }) },
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/form-action/hooks/useAnswerFormStep.ts b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/form-action/hooks/useAnswerFormStep.ts
index 02b644a1711..ccdf116c2c2 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/form-action/hooks/useAnswerFormStep.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/form-action/hooks/useAnswerFormStep.ts
@@ -5,12 +5,7 @@ import { useAnswerToolCall } from '@/ai/hooks/useAnswerToolCall';
import { AiChatErrorCode } from '@/ai/utils/aiChatErrorCode';
import { useApolloCoreClient } from '@/object-metadata/hooks/useApolloCoreClient';
import { useFindOneRecordQuery } from '@/object-record/hooks/useFindOneRecordQuery';
-import { SUBMIT_FORM_STEP } from '@/workflow/graphql/mutations/submitFormStep';
import { useWorkflowRun } from '@/workflow/hooks/useWorkflowRun';
-import {
- type SubmitFormStepMutation,
- type SubmitFormStepMutationVariables,
-} from '~/generated/graphql';
import { isGraphqlErrorOfType } from '~/utils/is-graphql-error-of-type.util';
export const useAnswerFormStep = ({
@@ -44,24 +39,19 @@ export const useAnswerFormStep = ({
fetchPolicy: 'network-only',
});
- // Forms started before conversations are available still have the run and step IDs.
+ // A form step's call is named after the step, in the conversation its
+ // current execution recorded.
const answerFormStep = async (
response: Record<string, unknown>,
): Promise<boolean> => {
- try {
- const threadId = workflowRun?.state?.stepInfos[stepId]?.threadId;
+ const threadId = workflowRun?.state?.stepInfos[stepId]?.threadId;
- if (isDefined(threadId)) {
- await answerToolCall({ threadId, toolCallId: stepId, response });
- } else {
- await apolloCoreClient.mutate<
- SubmitFormStepMutation,
- SubmitFormStepMutationVariables
- >({
- mutation: SUBMIT_FORM_STEP,
- variables: { input: { workflowRunId, stepId, response } },
- });
- }
+ if (!isDefined(threadId)) {
+ return false;
+ }
+
+ try {
+ await answerToolCall({ threadId, toolCallId: stepId, response });
} catch (error) {
if (!isGraphqlErrorOfType(error, AiChatErrorCode.TOOL_CALL_NOT_PENDING)) {
throw error;
diff --git a/packages/twenty-front/src/modules/workspace/utils/__tests__/getWorkspaceFeatureFlagsMap.test.ts b/packages/twenty-front/src/modules/workspace/utils/__tests__/getWorkspaceFeatureFlagsMap.test.ts
index aa3b4a8806a..06f77e88b8c 100644
--- a/packages/twenty-front/src/modules/workspace/utils/__tests__/getWorkspaceFeatureFlagsMap.test.ts
+++ b/packages/twenty-front/src/modules/workspace/utils/__tests__/getWorkspaceFeatureFlagsMap.test.ts
@@ -12,11 +12,11 @@ describe('getWorkspaceFeatureFlagsMap', () => {
expect(
getWorkspaceFeatureFlagsMap([
{ key: FeatureFlagKey.IS_CONVERSATIONS_TAB_ENABLED, value: true },
- { key: FeatureFlagKey.IS_RECORD_SHARING_ENABLED, value: false },
+ { key: FeatureFlagKey.IS_JSON_FILTER_ENABLED, value: false },
]),
).toEqual({
IS_CONVERSATIONS_TAB_ENABLED: true,
- IS_RECORD_SHARING_ENABLED: false,
+ IS_JSON_FILTER_ENABLED: false,
});
});
});
diff --git a/packages/twenty-front/src/pages/ai-chat/AiChatPage.tsx b/packages/twenty-front/src/pages/ai-chat/AiChatPage.tsx
index 6b8c4d3e99b..fe886a3bf21 100644
--- a/packages/twenty-front/src/pages/ai-chat/AiChatPage.tsx
+++ b/packages/twenty-front/src/pages/ai-chat/AiChatPage.tsx
@@ -13,9 +13,6 @@ import { AiChatTab } from '@/ai/components/AiChatTab';
import { AI_CHAT_SURFACE } from '@/ai/constants/AiChatSurface';
import { AiChatSurfaceContext } from '@/ai/contexts/AiChatSurfaceContext';
import { currentAiChatThreadState } from '@/ai/states/currentAiChatThreadState';
-import { objectMetadataItemFamilySelector } from '@/object-metadata/states/objectMetadataItemFamilySelector';
-import { recordPageLayoutByObjectMetadataIdFamilySelector } from '@/page-layout/states/selectors/recordPageLayoutByObjectMetadataIdFamilySelector';
-import { useAtomFamilySelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilySelectorValue';
import { getDisplayedAiChatThreadId } from '@/ai/utils/getDisplayedAiChatThreadId';
import { PageCardLayout } from '@/ui/layout/page/components/PageCardLayout';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
@@ -35,17 +32,6 @@ export const AiChatPage = () => {
const { threadId } = useParams();
const currentAiChatThread = useAtomStateValue(currentAiChatThreadState);
const isMobile = useIsMobile();
- const chatObjectMetadata = useAtomFamilySelectorValue(
- objectMetadataItemFamilySelector,
- {
- objectName: CoreObjectNameSingular.AgentChatThread,
- objectNameType: 'singular',
- },
- );
- const chatRecordPageLayout = useAtomFamilySelectorValue(
- recordPageLayoutByObjectMetadataIdFamilySelector,
- { objectMetadataId: chatObjectMetadata?.id ?? '' },
- );
const displayedThreadId = getDisplayedAiChatThreadId({
urlThreadId: threadId,
currentAiChatThread,
@@ -56,7 +42,7 @@ export const AiChatPage = () => {
<AiChatPageThreadUrlSyncEffect />
<AiChatPageCloseSidePanelChatEffect />
<AiChatPageContinueInSidePanelEffect />
- {isDefined(displayedThreadId) && isDefined(chatRecordPageLayout) ? (
+ {isDefined(displayedThreadId) ? (
<RecordShowPageContent
parameters={{
objectNameSingular: CoreObjectNameSingular.AgentChatThread,
@@ -69,7 +55,7 @@ export const AiChatPage = () => {
isRecordIdentifierBarHidden
/>
) : (
- // Saved chats also use this surface until their record layout exists.
+ // A new chat has no record until its first message is sent
<PageCardLayout header={<AiChatPageHeader />}>
<StyledChatContainer>
<AiChatSurfaceContext.Provider value={AI_CHAT_SURFACE.PAGE}>
diff --git a/packages/twenty-front/src/pages/ai-chat/__tests__/AiChatPage.test.tsx b/packages/twenty-front/src/pages/ai-chat/__tests__/AiChatPage.test.tsx
index 8c2072fe893..becc72e5248 100644
--- a/packages/twenty-front/src/pages/ai-chat/__tests__/AiChatPage.test.tsx
+++ b/packages/twenty-front/src/pages/ai-chat/__tests__/AiChatPage.test.tsx
@@ -45,25 +45,6 @@ jest.mock('@/ai/components/AiChatPageCloseSidePanelChatEffect', () => ({
}));
let mockIsMobile = false;
-let mockHasChatLayout = true;
-let mockHasChatObject = true;
-
-jest.mock(
- '@/ui/utilities/state/jotai/hooks/useAtomFamilySelectorValue',
- () => ({
- useAtomFamilySelectorValue: (
- _selector: unknown,
- parameters: Record<string, unknown>,
- ) =>
- 'objectMetadataId' in parameters
- ? mockHasChatLayout && parameters.objectMetadataId
- ? { id: 'chat-layout-id' }
- : undefined
- : mockHasChatObject
- ? { id: 'chat-object-id' }
- : null,
- }),
-);
jest.mock('twenty-ui/utilities', () => ({
...jest.requireActual('twenty-ui/utilities'),
@@ -118,8 +99,6 @@ describe('AiChatPage', () => {
beforeEach(() => {
jest.clearAllMocks();
mockIsMobile = false;
- mockHasChatLayout = true;
- mockHasChatObject = true;
sessionStorage.clear();
resetJotaiStore();
});
@@ -136,20 +115,6 @@ describe('AiChatPage', () => {
},
);
- it.each(['object', 'layout'])(
- 'keeps a saved chat usable without its %s metadata',
- (missingMetadata) => {
- mockHasChatObject = missingMetadata !== 'object';
- mockHasChatLayout = missingMetadata !== 'layout';
- jotaiStore.set(currentAiChatThreadState.atom, THREAD_ID);
-
- const { getByTestId, queryByText } = renderAt(`/chat/${THREAD_ID}`);
-
- expect(getByTestId('ai-chat-tab')).toHaveTextContent('page');
- expect(queryByText(/Record page/)).toBeNull();
- },
- );
-
it('renders the current chat as its record page when the URL has no chat', () => {
jotaiStore.set(currentAiChatThreadState.atom, THREAD_ID);
diff --git a/packages/twenty-oxlint-rules/rules/no-runtime-import-from-upgrade-command.spec.ts b/packages/twenty-oxlint-rules/rules/no-runtime-import-from-upgrade-command.spec.ts
index efbe944d8ca..c348f576de4 100644
--- a/packages/twenty-oxlint-rules/rules/no-runtime-import-from-upgrade-command.spec.ts
+++ b/packages/twenty-oxlint-rules/rules/no-runtime-import-from-upgrade-command.spec.ts
@@ -59,5 +59,10 @@ ruleTester.run(RULE_NAME, rule, {
filename: `${SERVER}/src/engine/core-modules/foo/foo.service.ts`,
errors: [{ messageId: 'noRuntimeImportFromUpgradeCommand' }],
},
+ {
+ code: "import { AgentHistoryUpgradeStorageService } from 'src/database/commands/agent-history/agent-history-upgrade-storage.service';",
+ filename: `${SERVER}/src/engine/metadata-modules/ai/ai-history/services/foo.service.ts`,
+ errors: [{ messageId: 'noRuntimeImportFromUpgradeCommand' }],
+ },
],
});
diff --git a/packages/twenty-oxlint-rules/rules/no-runtime-import-from-upgrade-command.ts b/packages/twenty-oxlint-rules/rules/no-runtime-import-from-upgrade-command.ts
index 7d2b5d67059..e812991d40e 100644
--- a/packages/twenty-oxlint-rules/rules/no-runtime-import-from-upgrade-command.ts
+++ b/packages/twenty-oxlint-rules/rules/no-runtime-import-from-upgrade-command.ts
@@ -2,8 +2,10 @@ import { defineRule } from '@oxlint/plugins';
export const RULE_NAME = 'no-runtime-import-from-upgrade-command';
-const UPGRADE_COMMAND_IMPORT_PREFIX =
- 'src/database/commands/upgrade-version-command/';
+const UPGRADE_COMMAND_IMPORT_PREFIXES = [
+ 'src/database/commands/upgrade-version-command/',
+ 'src/database/commands/agent-history/',
+];
const ALLOWED_IMPORT_REGEX = /-upgrade-command-name\.constants?$/;
@@ -20,7 +22,7 @@ const isExemptFile = (filename: string): boolean =>
EXEMPT_FILE_REGEXES.some((regex) => regex.test(filename));
const isForbiddenImportSource = (source: string): boolean =>
- source.startsWith(UPGRADE_COMMAND_IMPORT_PREFIX) &&
+ UPGRADE_COMMAND_IMPORT_PREFIXES.some((prefix) => source.startsWith(prefix)) &&
!ALLOWED_IMPORT_REGEX.test(source);
export const rule = defineRule({
@@ -28,12 +30,12 @@ export const rule = defineRule({
type: 'problem',
docs: {
description:
- 'Forbid runtime code from importing upgrade command code, which is frozen once released',
+ 'Forbid runtime code from importing upgrade command or agent-history migration code, which is frozen once released',
},
schema: [],
messages: {
noRuntimeImportFromUpgradeCommand:
- "Runtime code must not import '{{ source }}'. Keep migration-only logic, constants and legacy formats in the version folder, and move shared primitives out of it instead.",
+ "Runtime code must not import '{{ source }}'. Keep migration-only logic, constants and legacy formats with the migration code, and move shared primitives out of it instead.",
},
},
create: (context) => {
diff --git a/packages/twenty-server/src/database/commands/agent-history/__tests__/agent-history-migration.postgres.spec.ts b/packages/twenty-server/src/database/commands/agent-history/__tests__/agent-history-migration.postgres.spec.ts
index 6272aacb403..139f0c270d1 100644
--- a/packages/twenty-server/src/database/commands/agent-history/__tests__/agent-history-migration.postgres.spec.ts
+++ b/packages/twenty-server/src/database/commands/agent-history/__tests__/agent-history-migration.postgres.spec.ts
@@ -45,8 +45,8 @@ import { AgentHistoryMigrationStateService } from 'src/database/commands/agent-h
import { AgentHistoryMigrationService } from 'src/database/commands/agent-history/agent-history-migration.service';
import { AGENT_HISTORY_TABLES } from 'src/database/commands/agent-history/agent-history-tables.constant';
import { AGENT_HISTORY_TEST_SCHEMA } from 'src/database/commands/agent-history/__tests__/agent-history-test-schema.constant';
-import { AgentHistoryStorageService } from 'src/engine/metadata-modules/ai/ai-history/services/agent-history-storage.service';
-import { AGENT_HISTORY_STORAGE_KEY } from 'src/engine/metadata-modules/ai/ai-history/constants/agent-history-storage-key.constant';
+import { AgentHistoryUpgradeStorageService } from 'src/database/commands/agent-history/agent-history-upgrade-storage.service';
+import { AGENT_HISTORY_MIGRATION_STORAGE_KEY } from 'src/database/commands/agent-history/agent-history-migration-storage-key.constant';
import { getWorkspaceSchemaName } from 'src/engine/workspace-datasource/utils/get-workspace-schema-name.util';
const DATABASE_URL = process.env.AGENT_HISTORY_TEST_DATABASE_URL;
@@ -67,7 +67,7 @@ const SCHEMA = getWorkspaceSchemaName(WORKSPACE_ID);
entities: [],
synchronize: false,
});
- const storage = new AgentHistoryStorageService(dataSource);
+ const storage = new AgentHistoryUpgradeStorageService(dataSource);
const workspaceStorage = new AgentHistoryWorkspaceStorageService(
dataSource,
);
@@ -112,7 +112,6 @@ const SCHEMA = getWorkspaceSchemaName(WORKSPACE_ID);
).idByNameSingular,
featureFlagsMap: {} as Record<FeatureFlagKey, boolean>,
billingEntitlements: {},
- isRecordSharingEnabled: false,
userWorkspaceRoleMap: {},
apiKeyRoleMap: {},
eventEmitterService: { emitDatabaseBatchEvent },
@@ -163,48 +162,6 @@ const SCHEMA = getWorkspaceSchemaName(WORKSPACE_ID);
orm,
);
- const prepareLegacyMessages = async (
- missingFields: ('senderUserWorkspaceId' | 'senderApplicationId')[] = [
- 'senderUserWorkspaceId',
- 'senderApplicationId',
- ],
- ) => {
- await migration.migrate({
- workspaceId: WORKSPACE_ID,
- target: 'workspace',
- });
- const legacyMetadata = structuredClone(metadata);
- const messageObject =
- legacyMetadata.flatObjectMetadataMaps.byUniversalIdentifier[
- STANDARD_OBJECTS.agentMessage.universalIdentifier
- ]!;
- for (const name of missingFields) {
- const identifier =
- STANDARD_OBJECTS.agentMessage.fields[name].universalIdentifier;
- const field =
- legacyMetadata.flatFieldMetadataMaps.byUniversalIdentifier[
- identifier
- ]!;
- delete legacyMetadata.flatFieldMetadataMaps.byUniversalIdentifier[
- identifier
- ];
- delete legacyMetadata.flatFieldMetadataMaps.universalIdentifierById[
- field.id
- ];
- messageObject.fieldIds = messageObject.fieldIds.filter(
- (id) => id !== field.id,
- );
- await dataSource.query(
- `ALTER TABLE "${SCHEMA}"."agentMessage" DROP COLUMN "${name}"`,
- );
- }
- return new AgentHistoryRepository<AgentMessageWorkspaceEntity>(
- 'agentMessage',
- storage,
- createOrm(legacyMetadata),
- );
- };
-
const readRoute = async () => {
const runner = dataSource.createQueryRunner();
try {
@@ -701,7 +658,7 @@ const SCHEMA = getWorkspaceSchemaName(WORKSPACE_ID);
it('serializes competing migration runners', async () => {
const runner = dataSource.createQueryRunner();
await runner.connect();
- const key = `${AGENT_HISTORY_STORAGE_KEY}:runner:${WORKSPACE_ID}`;
+ const key = `${AGENT_HISTORY_MIGRATION_STORAGE_KEY}:runner:${WORKSPACE_ID}`;
await runner.query('SELECT pg_advisory_lock(hashtextextended($1, 0))', [
key,
]);
@@ -930,47 +887,11 @@ const SCHEMA = getWorkspaceSchemaName(WORKSPACE_ID);
).toMatchObject({ status: AgentMessageStatus.SENT });
});
- it.each([
- { senderUserWorkspaceId: OWNER_ID, senderApplicationId: null },
- { senderUserWorkspaceId: THREAD_ID, senderApplicationId: null },
- { senderUserWorkspaceId: OWNER_ID, senderApplicationId: TURN_ID },
- ])(
- 'requires expanded metadata before accepting sender writes: %o',
- async (sender) => {
- const legacyMessages = await prepareLegacyMessages();
- const count = await legacyMessages.count(WORKSPACE_ID);
- await expect(
- legacyMessages.insert(WORKSPACE_ID, [
- {
- threadId: THREAD_ID,
- role: AgentMessageRole.USER,
- senderUserWorkspaceId: OWNER_ID,
- senderApplicationId: null,
- },
- { threadId: THREAD_ID, role: AgentMessageRole.USER, ...sender },
- ]),
- ).rejects.toThrow(
- 'Complete upgrade:2-43:attribute-chat-message-senders',
- );
- expect(await legacyMessages.count(WORKSPACE_ID)).toBe(count);
- },
- );
-
- it('rejects incomplete sender expansion and persists full attribution after upgrade', async () => {
- const legacyMessages = await prepareLegacyMessages([
- 'senderApplicationId',
- ]);
- await expect(
- legacyMessages.insertAndReturnOne(WORKSPACE_ID, {
- threadId: THREAD_ID,
- role: AgentMessageRole.USER,
- senderUserWorkspaceId: TURN_ID,
- senderApplicationId: null,
- }),
- ).rejects.toThrow('Complete upgrade:2-43:attribute-chat-message-senders');
- await dataSource.query(
- `ALTER TABLE "${SCHEMA}"."agentMessage" ADD COLUMN "senderApplicationId" uuid`,
- );
+ it('persists full sender and application attribution', async () => {
+ await migration.migrate({
+ workspaceId: WORKSPACE_ID,
+ target: 'workspace',
+ });
const upgraded = await messages.insertAndReturnOne(WORKSPACE_ID, {
threadId: THREAD_ID,
role: AgentMessageRole.USER,
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/2-43-workspace-command-1790171503075-attribute-chat-message-senders.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/2-43-workspace-command-1790171503075-attribute-chat-message-senders.command.ts
index 5406c507a8c..376a44a33a3 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/2-43-workspace-command-1790171503075-attribute-chat-message-senders.command.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/2-43-workspace-command-1790171503075-attribute-chat-message-senders.command.ts
@@ -7,7 +7,7 @@ import { type RunOnWorkspaceArgs } from 'src/database/commands/command-runners/w
import { RegisteredWorkspaceCommand } from 'src/engine/core-modules/upgrade/decorators/registered-workspace-command.decorator';
import { AgentHistorySchemaService } from 'src/database/commands/agent-history/agent-history-schema.service';
import { isEmptyUnprovisionedAgentHistoryWorkspace } from 'src/database/commands/upgrade-version-command/2-43/utils/is-empty-unprovisioned-agent-history-workspace.util';
-import { AgentHistoryStorageService } from 'src/engine/metadata-modules/ai/ai-history/services/agent-history-storage.service';
+import { AgentHistoryUpgradeStorageService } from 'src/database/commands/agent-history/agent-history-upgrade-storage.service';
@RegisteredWorkspaceCommand('2.43.0', 1790171503075)
@Command({
@@ -18,7 +18,7 @@ export class AttributeChatMessageSendersCommand extends ProvisionedWorkspaceComm
constructor(
protected readonly workspaceIteratorService: WorkspaceIteratorService,
private readonly schema: AgentHistorySchemaService,
- private readonly storage: AgentHistoryStorageService,
+ private readonly storage: AgentHistoryUpgradeStorageService,
@InjectDataSource() private readonly dataSource: DataSource,
) {
super(workspaceIteratorService);
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/2-43-workspace-command-1790312694997-enable-common-record-sharing.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/2-43-workspace-command-1790312694997-enable-common-record-sharing.command.ts
index 189b4601eb9..107e1f71d28 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/2-43-workspace-command-1790312694997-enable-common-record-sharing.command.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/2-43-workspace-command-1790312694997-enable-common-record-sharing.command.ts
@@ -15,7 +15,7 @@ import { ProvisionedWorkspaceCommandRunner } from 'src/database/commands/command
import { WorkspaceIteratorService } from 'src/database/commands/command-runners/workspace-iterator.service';
import { type RunOnWorkspaceArgs } from 'src/database/commands/command-runners/workspace.command-runner';
import { RegisteredWorkspaceCommand } from 'src/engine/core-modules/upgrade/decorators/registered-workspace-command.decorator';
-import { AgentHistoryStorageService } from 'src/engine/metadata-modules/ai/ai-history/services/agent-history-storage.service';
+import { AgentHistoryUpgradeStorageService } from 'src/database/commands/agent-history/agent-history-upgrade-storage.service';
import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
import { WorkspaceMigrationValidateBuildAndRunService } from 'src/engine/workspace-manager/workspace-migration/services/workspace-migration-validate-build-and-run-service';
@@ -29,7 +29,7 @@ export class EnableCommonRecordSharingCommand extends ProvisionedWorkspaceComman
constructor(
protected readonly workspaceIteratorService: WorkspaceIteratorService,
private readonly workspaceCacheService: WorkspaceCacheService,
- private readonly storage: AgentHistoryStorageService,
+ private readonly storage: AgentHistoryUpgradeStorageService,
private readonly migrations: WorkspaceMigrationValidateBuildAndRunService,
private readonly billingSubscriptionService: BillingSubscriptionService,
@InjectDataSource() private readonly dataSource: DataSource,
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/__tests__/enable-common-record-sharing.command.spec.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/__tests__/enable-common-record-sharing.command.spec.ts
index 285d5098aff..1f833e3fcf8 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/__tests__/enable-common-record-sharing.command.spec.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/__tests__/enable-common-record-sharing.command.spec.ts
@@ -1,10 +1,6 @@
import { preserveLegacyRecordAccess } from 'src/database/commands/upgrade-version-command/2-43/utils/preserve-legacy-record-access.util';
import { STANDARD_OBJECTS } from 'twenty-shared/metadata';
-import {
- FeatureFlagKey,
- MetadataReadability,
- MetadataWritability,
-} from 'twenty-shared/types';
+import { MetadataReadability, MetadataWritability } from 'twenty-shared/types';
import { ServiceUnavailableException } from '@nestjs/common';
@@ -92,7 +88,7 @@ describe('Common sharing upgrade', () => {
async (flag, entitlement, wasRecordSharingEnabled) => {
const { command, maps, billing } = buildCommand();
Object.assign(maps.featureFlagsMap, {
- [FeatureFlagKey.IS_RECORD_SHARING_ENABLED]: flag,
+ IS_RECORD_SHARING_ENABLED: flag,
});
billing.getWorkspaceEntitlementValue.mockResolvedValue(entitlement);
await command.up(args);
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/utils/__tests__/is-empty-unprovisioned-agent-history-workspace.util.spec.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/utils/__tests__/is-empty-unprovisioned-agent-history-workspace.util.spec.ts
index a395e705f4b..128419e2d1a 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/utils/__tests__/is-empty-unprovisioned-agent-history-workspace.util.spec.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/utils/__tests__/is-empty-unprovisioned-agent-history-workspace.util.spec.ts
@@ -1,7 +1,7 @@
import { type DataSource } from 'typeorm';
import { isEmptyUnprovisionedAgentHistoryWorkspace } from 'src/database/commands/upgrade-version-command/2-43/utils/is-empty-unprovisioned-agent-history-workspace.util';
-import { AgentHistoryStorageService } from 'src/engine/metadata-modules/ai/ai-history/services/agent-history-storage.service';
+import { AgentHistoryUpgradeStorageService } from 'src/database/commands/agent-history/agent-history-upgrade-storage.service';
describe('isEmptyUnprovisionedAgentHistoryWorkspace', () => {
const workspaceId = '20202020-1111-4111-8111-111111111111';
@@ -14,7 +14,7 @@ describe('isEmptyUnprovisionedAgentHistoryWorkspace', () => {
const dataSource = {
createQueryRunner: () => runner,
} as unknown as DataSource;
- const agentHistoryStorageService = new AgentHistoryStorageService(dataSource);
+ const agentHistoryStorageService = new AgentHistoryUpgradeStorageService(dataSource);
beforeEach(() => {
jest.clearAllMocks();
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/utils/is-empty-unprovisioned-agent-history-workspace.util.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/utils/is-empty-unprovisioned-agent-history-workspace.util.ts
index e789f651d8b..c63a5ccf61f 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/utils/is-empty-unprovisioned-agent-history-workspace.util.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/utils/is-empty-unprovisioned-agent-history-workspace.util.ts
@@ -2,7 +2,7 @@ import { isDefined, isNonEmptyArray } from 'twenty-shared/utils';
import { type DataSource } from 'typeorm';
import { AGENT_HISTORY_OBJECT_NAMES } from 'src/engine/metadata-modules/ai/ai-history/constants/agent-history-object-names.constant';
-import { type AgentHistoryStorageService } from 'src/engine/metadata-modules/ai/ai-history/services/agent-history-storage.service';
+import { type AgentHistoryUpgradeStorageService } from 'src/database/commands/agent-history/agent-history-upgrade-storage.service';
import { getWorkspaceSchemaName } from 'src/engine/workspace-datasource/utils/get-workspace-schema-name.util';
// Older installations can retain empty workspace records without a physical
@@ -13,7 +13,7 @@ export const isEmptyUnprovisionedAgentHistoryWorkspace = async ({
workspaceId,
}: {
dataSource: DataSource;
- agentHistoryStorageService: AgentHistoryStorageService;
+ agentHistoryStorageService: AgentHistoryUpgradeStorageService;
workspaceId: string;
}): Promise<boolean> => {
const runner = dataSource.createQueryRunner('master');
diff --git a/packages/twenty-server/src/engine/core-modules/workflow/dtos/submit-form-step.input.ts b/packages/twenty-server/src/engine/core-modules/workflow/dtos/submit-form-step.input.ts
deleted file mode 100644
index 0ab14d8dab0..00000000000
--- a/packages/twenty-server/src/engine/core-modules/workflow/dtos/submit-form-step.input.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { Field, InputType } from '@nestjs/graphql';
-
-import graphqlTypeJson from 'graphql-type-json';
-
-import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
-
-@InputType()
-export class SubmitFormStepInput {
- @Field(() => UUIDScalarType, {
- description: 'Workflow step ID',
- nullable: false,
- })
- stepId: string;
-
- @Field(() => UUIDScalarType, {
- description: 'Workflow run ID',
- nullable: false,
- })
- workflowRunId: string;
-
- @Field(() => graphqlTypeJson, {
- description: 'Form response in JSON format',
- nullable: false,
- })
- response: JSON;
-}
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/dtos/agent-chat-question-answer.input.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/dtos/agent-chat-question-answer.input.ts
deleted file mode 100644
index 3c92c1570ff..00000000000
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/dtos/agent-chat-question-answer.input.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { Field, InputType, Int } from '@nestjs/graphql';
-
-@InputType()
-export class AgentChatQuestionAnswerInput {
- @Field(() => Int)
- questionIndex: number;
-
- @Field(() => [Int])
- selectedOptionIndices: number[];
-
- @Field(() => String, { nullable: true })
- freeText?: string;
-}
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/query-hooks/agent-chat-thread-delete-many.pre-query.hook.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/query-hooks/agent-chat-thread-delete-many.pre-query.hook.ts
index 9f74147956b..0cb156a97f8 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/query-hooks/agent-chat-thread-delete-many.pre-query.hook.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/query-hooks/agent-chat-thread-delete-many.pre-query.hook.ts
@@ -3,26 +3,18 @@ import { type DeleteManyResolverArgs } from 'src/engine/api/graphql/workspace-re
import { WorkspaceQueryHook } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/decorators/workspace-query-hook.decorator';
import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
-import { AgentChatThreadLifecycleService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-chat-thread-lifecycle.service';
+import { excludeWorkflowRunThreadsFromFilter } from 'src/engine/metadata-modules/ai/ai-chat/utils/exclude-workflow-run-threads-from-filter.util';
@WorkspaceQueryHook(`agentChatThread.deleteMany`)
export class AgentChatThreadDeleteManyPreQueryHook implements WorkspacePreQueryHookInstance {
- constructor(
- private readonly threadLifecycleService: AgentChatThreadLifecycleService,
- ) {}
-
async execute(
- authContext: WorkspaceAuthContext,
+ _authContext: WorkspaceAuthContext,
_objectName: string,
payload: DeleteManyResolverArgs,
): Promise<DeleteManyResolverArgs> {
return {
...payload,
- filter:
- await this.threadLifecycleService.excludeWorkflowRunThreadsFromFilter({
- workspaceId: authContext.workspace.id,
- filter: payload.filter,
- }),
+ filter: excludeWorkflowRunThreadsFromFilter(payload.filter),
};
}
}
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/query-hooks/agent-chat-thread-destroy-many.pre-query.hook.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/query-hooks/agent-chat-thread-destroy-many.pre-query.hook.ts
index ea2ff738e04..4d78028795c 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/query-hooks/agent-chat-thread-destroy-many.pre-query.hook.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/query-hooks/agent-chat-thread-destroy-many.pre-query.hook.ts
@@ -3,26 +3,18 @@ import { type DestroyManyResolverArgs } from 'src/engine/api/graphql/workspace-r
import { WorkspaceQueryHook } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/decorators/workspace-query-hook.decorator';
import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
-import { AgentChatThreadLifecycleService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-chat-thread-lifecycle.service';
+import { excludeWorkflowRunThreadsFromFilter } from 'src/engine/metadata-modules/ai/ai-chat/utils/exclude-workflow-run-threads-from-filter.util';
@WorkspaceQueryHook(`agentChatThread.destroyMany`)
export class AgentChatThreadDestroyManyPreQueryHook implements WorkspacePreQueryHookInstance {
- constructor(
- private readonly threadLifecycleService: AgentChatThreadLifecycleService,
- ) {}
-
async execute(
- authContext: WorkspaceAuthContext,
+ _authContext: WorkspaceAuthContext,
_objectName: string,
payload: DestroyManyResolverArgs,
): Promise<DestroyManyResolverArgs> {
return {
...payload,
- filter:
- await this.threadLifecycleService.excludeWorkflowRunThreadsFromFilter({
- workspaceId: authContext.workspace.id,
- filter: payload.filter,
- }),
+ filter: excludeWorkflowRunThreadsFromFilter(payload.filter),
};
}
}
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/query-hooks/agent-chat-thread-update-many.pre-query.hook.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/query-hooks/agent-chat-thread-update-many.pre-query.hook.ts
index b3e0c0efbf6..9c6faba4680 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/query-hooks/agent-chat-thread-update-many.pre-query.hook.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/query-hooks/agent-chat-thread-update-many.pre-query.hook.ts
@@ -3,26 +3,18 @@ import { type UpdateManyResolverArgs } from 'src/engine/api/graphql/workspace-re
import { WorkspaceQueryHook } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/decorators/workspace-query-hook.decorator';
import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
-import { AgentChatThreadLifecycleService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-chat-thread-lifecycle.service';
+import { excludeWorkflowRunThreadsFromFilter } from 'src/engine/metadata-modules/ai/ai-chat/utils/exclude-workflow-run-threads-from-filter.util';
@WorkspaceQueryHook(`agentChatThread.updateMany`)
export class AgentChatThreadUpdateManyPreQueryHook implements WorkspacePreQueryHookInstance {
- constructor(
- private readonly threadLifecycleService: AgentChatThreadLifecycleService,
- ) {}
-
async execute(
- authContext: WorkspaceAuthContext,
+ _authContext: WorkspaceAuthContext,
_objectName: string,
payload: UpdateManyResolverArgs,
): Promise<UpdateManyResolverArgs> {
return {
...payload,
- filter:
- await this.threadLifecycleService.excludeWorkflowRunThreadsFromFilter({
- workspaceId: authContext.workspace.id,
- filter: payload.filter,
- }),
+ filter: excludeWorkflowRunThreadsFromFilter(payload.filter),
};
}
}
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 b439ef3ff1a..ca6c9f5b9ab 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
@@ -90,7 +90,6 @@ const buildResolver = () => {
threadRepository as never,
redis as never,
{} as never,
- {} as never,
recordEvents as never,
);
const resolver = new AgentChatResolver(
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-thread-lifecycle.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-thread-lifecycle.service.ts
index 7d68847e617..a4f894e1d36 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-thread-lifecycle.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-thread-lifecycle.service.ts
@@ -13,13 +13,11 @@ import { getCancelChannel } from 'src/engine/metadata-modules/ai/ai-chat/utils/g
import { InjectAgentHistoryRepository } from 'src/engine/metadata-modules/ai/ai-history/repositories/inject-agent-history-repository.decorator';
import { AgentHistoryRepository } from 'src/engine/metadata-modules/ai/ai-history/repositories/agent-history-repository';
import { AgentChatThreadWorkspaceEntity } from 'src/engine/metadata-modules/ai/ai-history/standard-objects/agent-chat-thread.workspace-entity';
-import { hasWorkflowRunThreadFields } from 'src/engine/metadata-modules/ai/ai-history/utils/has-workflow-run-thread-fields.util';
import {
PermissionsException,
PermissionsExceptionCode,
PermissionsExceptionMessage,
} from 'src/engine/metadata-modules/permissions/permissions.exception';
-import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
@Injectable()
export class AgentChatThreadLifecycleService {
@@ -30,7 +28,6 @@ export class AgentChatThreadLifecycleService {
private readonly threadRepository: AgentHistoryRepository<AgentChatThreadWorkspaceEntity>,
private readonly redisClientService: RedisClientService,
private readonly codeInterpreterService: CodeInterpreterService,
- private readonly workspaceCacheService: WorkspaceCacheService,
private readonly threadRecordEventService: AgentChatThreadRecordEventService,
) {}
@@ -112,23 +109,6 @@ export class AgentChatThreadLifecycleService {
}
}
- async excludeWorkflowRunThreadsFromFilter<TFilter>({
- workspaceId,
- filter,
- }: {
- workspaceId: string;
- filter: TFilter;
- }): Promise<TFilter | { and: [TFilter, { workflowRunId: { is: 'NULL' } }] }> {
- const { flatFieldMetadataMaps } =
- await this.workspaceCacheService.getOrRecompute(workspaceId, [
- 'flatFieldMetadataMaps',
- ]);
-
- return hasWorkflowRunThreadFields(flatFieldMetadataMaps)
- ? { and: [filter, { workflowRunId: { is: 'NULL' } }] }
- : filter;
- }
-
// The owner field is not writable through the record API. Owned and
// workflow-run threads are skipped so an upsert cannot reassign them
async assignCreatedThreadsToCreator({
@@ -143,15 +123,9 @@ export class AgentChatThreadLifecycleService {
}
const workspaceId = authContext.workspace.id;
- const { flatFieldMetadataMaps } =
- await this.workspaceCacheService.getOrRecompute(workspaceId, [
- 'flatFieldMetadataMaps',
- ]);
const unassignedThreadCriteria = {
workspaceMemberId: IsNull(),
- ...(hasWorkflowRunThreadFields(flatFieldMetadataMaps)
- ? { workflowRunId: IsNull() }
- : {}),
+ workflowRunId: IsNull(),
};
const threadsBefore = await this.threadRepository.find(workspaceId, {
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/utils/exclude-workflow-run-threads-from-filter.util.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/utils/exclude-workflow-run-threads-from-filter.util.ts
new file mode 100644
index 00000000000..e33494889ac
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/utils/exclude-workflow-run-threads-from-filter.util.ts
@@ -0,0 +1,7 @@
+// A workflow run's conversation belongs to the run, so bulk record operations
+// on chats never reach it.
+export const excludeWorkflowRunThreadsFromFilter = <TFilter>(
+ filter: TFilter,
+): { and: [TFilter, { workflowRunId: { is: 'NULL' } }] } => ({
+ and: [filter, { workflowRunId: { is: 'NULL' } }],
+});
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/constants/agent-history-storage-key.constant.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/constants/agent-history-storage-key.constant.ts
deleted file mode 100644
index 529d7196ded..00000000000
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/constants/agent-history-storage-key.constant.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { AGENT_HISTORY_MIGRATION_STORAGE_KEY as AGENT_HISTORY_STORAGE_KEY } from 'src/database/commands/agent-history/agent-history-migration-storage-key.constant';
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/repositories/agent-history-repository.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/repositories/agent-history-repository.ts
index b1e62548808..f34168135e0 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/repositories/agent-history-repository.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/repositories/agent-history-repository.ts
@@ -1,4 +1,3 @@
-import { assertAgentMessageSenderFields } from 'src/engine/metadata-modules/ai/ai-history/utils/assert-agent-message-sender-fields.util';
import { addAgentMessageSenderWorkspaceMember } from 'src/engine/metadata-modules/ai/ai-history/utils/add-agent-message-sender-workspace-member.util';
import { hydrateAgentHistoryFiles } from 'src/engine/metadata-modules/ai/ai-history/utils/hydrate-agent-history-files.util';
import { removeAgentHistoryFileRelations } from 'src/engine/metadata-modules/ai/ai-history/utils/remove-agent-history-file-relations.util';
@@ -142,7 +141,6 @@ export class AgentHistoryRepository<TRecord extends { id: string }> {
values: QueryDeepPartialEntity<TRecord> | QueryDeepPartialEntity<TRecord>[],
) {
return this.run(workspaceId, async (repository, context) => {
- if (this.name === 'agentMessage') assertAgentMessageSenderFields();
return repository.insert(
await this.addSenderRelation(values, workspaceId, context),
);
@@ -154,7 +152,6 @@ export class AgentHistoryRepository<TRecord extends { id: string }> {
values: QueryDeepPartialEntity<TRecord>,
): Promise<TRecord> {
return this.run(workspaceId, async (repository, context) => {
- if (this.name === 'agentMessage') assertAgentMessageSenderFields();
const result = await repository.insert(
await this.addSenderRelation(values, workspaceId, context),
);
@@ -221,7 +218,6 @@ export class AgentHistoryRepository<TRecord extends { id: string }> {
conflictPaths: string[],
) {
return this.run(workspaceId, async (repository, context) => {
- if (this.name === 'agentMessage') assertAgentMessageSenderFields();
// Workspace upsert selects before inserting. Serialize concurrent stream
// checkpoints for the same identity so both cannot take the insert path.
const valuesByField: ObjectLiteral = values;
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/services/agent-history-storage.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/services/agent-history-storage.service.ts
deleted file mode 100644
index 172bb7b5b8a..00000000000
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/services/agent-history-storage.service.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-// Shipped upgrade commands keep this import while live chat uses workspace storage.
-export {
- AgentHistoryUpgradeStorageService as AgentHistoryStorageService,
- type AgentHistoryUpgradeStorageContext as AgentHistoryStorageContext,
-} from 'src/database/commands/agent-history/agent-history-upgrade-storage.service';
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/services/agent-history-workspace-storage.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/services/agent-history-workspace-storage.service.ts
index 32e8e98e85d..547021142e0 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/services/agent-history-workspace-storage.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/services/agent-history-workspace-storage.service.ts
@@ -56,7 +56,6 @@ export class AgentHistoryWorkspaceStorageService {
async run<TResult>(
workspaceId: string,
work: (context: AgentHistoryStorageContext) => Promise<TResult>,
- { lockMode = 'shared' }: { lockMode?: 'shared' | 'exclusive' } = {},
): Promise<TResult> {
if (!isNonEmptyString(workspaceId)) {
throw new AgentHistoryStorageException(
@@ -71,9 +70,7 @@ export class AgentHistoryWorkspaceStorageService {
await runner.startTransaction();
// A retried upgrade clears its destination; no live write may race that copy.
await runner.query(
- lockMode === 'exclusive'
- ? 'SELECT pg_advisory_xact_lock(hashtextextended($1, 0))'
- : 'SELECT pg_advisory_xact_lock_shared(hashtextextended($1, 0))',
+ 'SELECT pg_advisory_xact_lock_shared(hashtextextended($1, 0))',
[`${HISTORY_READINESS_KEY}:${workspaceId}`],
);
const ready = await runner.query(
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/__tests__/add-agent-message-sender-workspace-member.util.spec.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/__tests__/add-agent-message-sender-workspace-member.util.spec.ts
index 345bcb002c0..99a5dacfed6 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/__tests__/add-agent-message-sender-workspace-member.util.spec.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/__tests__/add-agent-message-sender-workspace-member.util.spec.ts
@@ -1,23 +1,6 @@
-import { STANDARD_OBJECTS } from 'twenty-shared/metadata';
import { addAgentMessageSenderWorkspaceMember } from 'src/engine/metadata-modules/ai/ai-history/utils/add-agent-message-sender-workspace-member.util';
-import { getWorkspaceContext } from 'src/engine/twenty-orm/storage/orm-workspace-context.storage';
-jest.mock(
- 'src/engine/twenty-orm/storage/orm-workspace-context.storage',
- () => ({ getWorkspaceContext: jest.fn() }),
-);
-
-const setup = (hasRelation = true) => {
- jest.mocked(getWorkspaceContext).mockReturnValue({
- flatFieldMetadataMaps: {
- byUniversalIdentifier: hasRelation
- ? {
- [STANDARD_OBJECTS.agentMessage.fields.senderWorkspaceMember
- .universalIdentifier]: {},
- }
- : {},
- },
- } as never);
+const setup = () => {
const query = jest
.fn()
.mockResolvedValue([{ membershipId: 'sender', memberId: 'member' }]);
@@ -33,16 +16,7 @@ const setup = (hasRelation = true) => {
};
describe('sender workspace member expansion', () => {
- it('preserves complete legacy attribution before the relation is available', async () => {
- const { query, expand } = setup(false);
- const message = {
- senderUserWorkspaceId: 'sender',
- senderApplicationId: 'application',
- };
- expect(await expand(message)).toEqual(message);
- expect(query).not.toHaveBeenCalled();
- });
- it('dual-writes members in a batch without changing sender or application IDs', async () => {
+ it('writes members in a batch without changing sender or application IDs', async () => {
const { query, expand } = setup();
const messages = [
{ senderUserWorkspaceId: 'sender', senderApplicationId: 'application' },
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/add-agent-message-sender-workspace-member.util.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/add-agent-message-sender-workspace-member.util.ts
index 85d1b458f21..d0c2f459e35 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/add-agent-message-sender-workspace-member.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/add-agent-message-sender-workspace-member.util.ts
@@ -1,9 +1,7 @@
-import { STANDARD_OBJECTS } from 'twenty-shared/metadata';
-import { isDefined, isNonEmptyString } from 'twenty-shared/utils';
+import { isNonEmptyString } from 'twenty-shared/utils';
import { type ObjectLiteral } from 'typeorm';
import { type AgentHistoryStorageContext } from 'src/engine/metadata-modules/ai/ai-history/services/agent-history-workspace-storage.service';
-import { getWorkspaceContext } from 'src/engine/twenty-orm/storage/orm-workspace-context.storage';
import { getWorkspaceSchemaName } from 'src/engine/workspace-datasource/utils/get-workspace-schema-name.util';
import { escapeIdentifier } from 'src/engine/workspace-manager/workspace-migration/utils/remove-sql-injection.util';
@@ -12,21 +10,6 @@ export const addAgentMessageSenderWorkspaceMember = async (
workspaceId: string,
{ manager }: AgentHistoryStorageContext,
): Promise<ObjectLiteral | ObjectLiteral[]> => {
- const { flatFieldMetadataMaps } = getWorkspaceContext();
-
- // The nullable relation is an expansion. Legacy attribution stays complete
- // while a workspace is still waiting for its relation migration.
- if (
- !isDefined(
- flatFieldMetadataMaps.byUniversalIdentifier[
- STANDARD_OBJECTS.agentMessage.fields.senderWorkspaceMember
- .universalIdentifier
- ],
- )
- ) {
- return values;
- }
-
const messages = Array.isArray(values) ? values : [values];
const senderIds = [
...new Set(
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/assert-agent-message-sender-fields.util.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/assert-agent-message-sender-fields.util.ts
deleted file mode 100644
index cdb730ec69a..00000000000
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/assert-agent-message-sender-fields.util.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import { ServiceUnavailableException } from '@nestjs/common';
-import { isDefined } from 'twenty-shared/utils';
-import { findFlatEntityByIdInFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps-or-throw.util';
-import { buildFieldMapsFromFlatObjectMetadata } from 'src/engine/metadata-modules/flat-field-metadata/utils/build-field-maps-from-flat-object-metadata.util';
-import { getWorkspaceContext } from 'src/engine/twenty-orm/storage/orm-workspace-context.storage';
-
-export const assertAgentMessageSenderFields = (): void => {
- const {
- flatObjectMetadataMaps,
- flatFieldMetadataMaps,
- objectIdByNameSingular,
- } = getWorkspaceContext();
- const object = findFlatEntityByIdInFlatEntityMapsOrThrow({
- flatEntityId: objectIdByNameSingular.agentMessage,
- flatEntityMaps: flatObjectMetadataMaps,
- });
- const { fieldIdByName } = buildFieldMapsFromFlatObjectMetadata(
- flatFieldMetadataMaps,
- object,
- );
- const missingFields = (
- ['senderUserWorkspaceId', 'senderApplicationId'] as const
- ).filter((field) => !isDefined(fieldIdByName[field]));
-
- if (missingFields.length > 0) {
- throw new ServiceUnavailableException(
- 'Chat sender attribution is not ready. Complete upgrade:2-43:attribute-chat-message-senders for this workspace and retry.',
- );
- }
-};
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/has-workflow-run-thread-fields.util.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/has-workflow-run-thread-fields.util.ts
deleted file mode 100644
index 8b759aa160c..00000000000
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/has-workflow-run-thread-fields.util.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { STANDARD_OBJECTS } from 'twenty-shared/metadata';
-import { isDefined } from 'twenty-shared/utils';
-
-import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
-import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';
-
-// Fence for the 2.44 cross-upgrade window: until
-// upgrade:2-44:add-workflow-run-to-chat-threads has reached a workspace, its
-// threads have no column to name a workflow run, so no run conversation can be
-// written and none has to be filtered out. Remove once 2.44 leaves the window.
-export const hasWorkflowRunThreadFields = (
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>,
-): boolean =>
- isDefined(
- flatFieldMetadataMaps.byUniversalIdentifier[
- STANDARD_OBJECTS.agentChatThread.fields.workflowRun.universalIdentifier
- ],
- );
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-tool-call-answer/ai-tool-call-answer.module.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-tool-call-answer/ai-tool-call-answer.module.ts
index dae45a810f7..d224bae56e0 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-tool-call-answer/ai-tool-call-answer.module.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-tool-call-answer/ai-tool-call-answer.module.ts
@@ -6,7 +6,6 @@ import { AiBillingModule } from 'src/engine/metadata-modules/ai/ai-billing/ai-bi
import { AgentChatStreamStateModule } from 'src/engine/metadata-modules/ai/ai-chat/agent-chat-stream-state.module';
import { AiChatModule } from 'src/engine/metadata-modules/ai/ai-chat/ai-chat.module';
import { AgentHistoryModule } from 'src/engine/metadata-modules/ai/ai-history/ai-history.module';
-import { AnswerAgentChatQuestionResolver } from 'src/engine/metadata-modules/ai/ai-tool-call-answer/resolvers/answer-agent-chat-question.resolver';
import { ToolCallAnswerResolver } from 'src/engine/metadata-modules/ai/ai-tool-call-answer/resolvers/tool-call-answer.resolver';
import { ToolCallAnswerService } from 'src/engine/metadata-modules/ai/ai-tool-call-answer/services/tool-call-answer.service';
import { AiGraphqlApiExceptionInterceptor } from 'src/engine/metadata-modules/ai/interceptors/ai-graphql-api-exception.interceptor';
@@ -33,7 +32,6 @@ import { WorkflowRunnerModule } from 'src/modules/workflow/workflow-runner/workf
providers: [
ToolCallAnswerService,
ToolCallAnswerResolver,
- AnswerAgentChatQuestionResolver,
AiGraphqlApiExceptionInterceptor,
],
})
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-tool-call-answer/resolvers/answer-agent-chat-question.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-tool-call-answer/resolvers/answer-agent-chat-question.resolver.ts
deleted file mode 100644
index a3c20425f61..00000000000
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-tool-call-answer/resolvers/answer-agent-chat-question.resolver.ts
+++ /dev/null
@@ -1,116 +0,0 @@
-import {
- UseFilters,
- UseGuards,
- UseInterceptors,
- UsePipes,
-} from '@nestjs/common';
-import { Args, Mutation } from '@nestjs/graphql';
-
-import { isDefined, isNonEmptyArray } from 'twenty-shared/utils';
-
-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';
-import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
-import { BillingGraphqlApiExceptionFilter } from 'src/engine/core-modules/billing/filters/billing-graphql-api-exception.filter';
-import { PreventNestToAutoLogGraphqlErrorsFilter } from 'src/engine/core-modules/graphql/filters/prevent-nest-to-auto-log-graphql-errors.filter';
-import { ResolverValidationPipe } from 'src/engine/core-modules/graphql/pipes/resolver-validation.pipe';
-import { UsageLimitGraphqlApiExceptionFilter } from 'src/engine/core-modules/usage-limit/filters/usage-limit-graphql-api-exception.filter';
-import { WorkflowVersionStepGraphqlApiExceptionFilter } from 'src/engine/core-modules/workflow/filters/workflow-version-step-graphql-api-exception.filter';
-import { type WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
-import { AuthUserWorkspaceId } from 'src/engine/decorators/auth/auth-user-workspace-id.decorator';
-import { AuthWorkspaceMemberId } from 'src/engine/decorators/auth/auth-workspace-member-id.decorator';
-import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
-import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
-import { CustomPermissionGuard } from 'src/engine/guards/custom-permission.guard';
-import { AgentChatQuestionAnswerInput } from 'src/engine/metadata-modules/ai/ai-chat/dtos/agent-chat-question-answer.input';
-import { FileAttachmentInput } from 'src/engine/metadata-modules/ai/ai-chat/dtos/file-attachment.input';
-import { SendChatMessageResultDTO } from 'src/engine/metadata-modules/ai/ai-chat/dtos/send-chat-message-result.dto';
-import { tagAiChatStreamScope } from 'src/engine/metadata-modules/ai/ai-chat/utils/tag-ai-chat-stream-scope.util';
-import { AiGraphqlApiExceptionInterceptor } from 'src/engine/metadata-modules/ai/interceptors/ai-graphql-api-exception.interceptor';
-import { ToolCallAnswerService } from 'src/engine/metadata-modules/ai/ai-tool-call-answer/services/tool-call-answer.service';
-import {
- AiException,
- AiExceptionCode,
-} from 'src/engine/metadata-modules/ai/ai.exception';
-import { PermissionsGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/permissions/utils/permissions-graphql-api-exception.filter';
-
-// The metadata API's answer mutation from before answerToolCall, kept so
-// clients built against it keep working for a release. It answers the
-// questions the message asked, with the same checks as answerToolCall.
-@MetadataResolver()
-@UsePipes(ResolverValidationPipe)
-@UseGuards(
- AuthPrincipalGuard({
- userSession: {
- standard: true,
- impersonated: true,
- playground: true,
- workspaceAgnostic: false,
- },
- apiKey: false,
- oauthClient: { withUser: true, withoutUser: false },
- application: { withUser: true, withoutUser: false },
- }),
-)
-@UseInterceptors(AiGraphqlApiExceptionInterceptor)
-@UseFilters(
- UsageLimitGraphqlApiExceptionFilter,
- BillingGraphqlApiExceptionFilter,
- PermissionsGraphqlApiExceptionFilter,
- WorkflowVersionStepGraphqlApiExceptionFilter,
- PreventNestToAutoLogGraphqlErrorsFilter,
- AuthGraphqlApiExceptionFilter,
-)
-export class AnswerAgentChatQuestionResolver {
- constructor(private readonly toolCallAnswerService: ToolCallAnswerService) {}
-
- @Mutation(() => SendChatMessageResultDTO, {
- deprecationReason: 'Use answerToolCall with the questions tool call',
- })
- @UseGuards(CustomPermissionGuard)
- async answerAgentChatQuestion(
- @Args('threadId', { type: () => UUIDScalarType }) threadId: string,
- @Args('messageId', { type: () => UUIDScalarType }) messageId: string,
- @Args('answers', { type: () => [AgentChatQuestionAnswerInput] })
- answers: AgentChatQuestionAnswerInput[],
- @Args('modelId', { type: () => String, nullable: true })
- modelId: string | undefined,
- @Args('fileAttachments', {
- type: () => [FileAttachmentInput],
- nullable: true,
- })
- fileAttachments: FileAttachmentInput[] | null,
- @AuthUserWorkspaceId() userWorkspaceId: string,
- @AuthWorkspaceMemberId() workspaceMemberId: string,
- @AuthWorkspace() workspace: WorkspaceEntity,
- ): Promise<SendChatMessageResultDTO> {
- if (isNonEmptyArray(fileAttachments)) {
- throw new AiException(
- 'Files can no longer be sent with an answer: send them in a message',
- AiExceptionCode.INVALID_TOOL_CALL_OUTPUT,
- );
- }
-
- const { streamId, turnId } =
- await this.toolCallAnswerService.answerQuestionsOfMessage({
- threadId,
- messageId,
- response: { answers: answers.map((answer) => ({ ...answer })) },
- modelId,
- userWorkspaceId,
- workspaceMemberId,
- workspace,
- });
-
- if (isDefined(streamId)) {
- tagAiChatStreamScope({
- streamId,
- turnId,
- threadId,
- workspaceId: workspace.id,
- });
- }
-
- return { messageId, queued: false, streamId: streamId ?? undefined };
- }
-}
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-tool-call-answer/resolvers/tool-call-answer.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-tool-call-answer/resolvers/tool-call-answer.resolver.ts
index c029339ab2b..3ba953837d2 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-tool-call-answer/resolvers/tool-call-answer.resolver.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-tool-call-answer/resolvers/tool-call-answer.resolver.ts
@@ -6,7 +6,7 @@ import {
} from '@nestjs/common';
import { Args, Mutation } from '@nestjs/graphql';
-import { isDefined, isPlainObject } from 'twenty-shared/utils';
+import { isDefined } from 'twenty-shared/utils';
import { CoreResolver } from 'src/engine/api/graphql/graphql-config/decorators/core-resolver.decorator';
import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
@@ -14,7 +14,6 @@ import { BillingGraphqlApiExceptionFilter } from 'src/engine/core-modules/billin
import { PreventNestToAutoLogGraphqlErrorsFilter } from 'src/engine/core-modules/graphql/filters/prevent-nest-to-auto-log-graphql-errors.filter';
import { ResolverValidationPipe } from 'src/engine/core-modules/graphql/pipes/resolver-validation.pipe';
import { UsageLimitGraphqlApiExceptionFilter } from 'src/engine/core-modules/usage-limit/filters/usage-limit-graphql-api-exception.filter';
-import { SubmitFormStepInput } from 'src/engine/core-modules/workflow/dtos/submit-form-step.input';
import { WorkflowVersionStepGraphqlApiExceptionFilter } from 'src/engine/core-modules/workflow/filters/workflow-version-step-graphql-api-exception.filter';
import { type WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
import { AuthUserWorkspaceId } from 'src/engine/decorators/auth/auth-user-workspace-id.decorator';
@@ -27,10 +26,6 @@ import { AiGraphqlApiExceptionInterceptor } from 'src/engine/metadata-modules/ai
import { AnswerToolCallResultDTO } from 'src/engine/metadata-modules/ai/ai-tool-call-answer/dtos/answer-tool-call-result.dto';
import { AnswerToolCallInput } from 'src/engine/metadata-modules/ai/ai-tool-call-answer/dtos/answer-tool-call.input';
import { ToolCallAnswerService } from 'src/engine/metadata-modules/ai/ai-tool-call-answer/services/tool-call-answer.service';
-import {
- AiException,
- AiExceptionCode,
-} from 'src/engine/metadata-modules/ai/ai.exception';
import { PermissionsGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/permissions/utils/permissions-graphql-api-exception.filter';
// Served on /graphql: the permission an answer needs depends on whether the
@@ -93,35 +88,4 @@ export class ToolCallAnswerResolver {
return { streamId };
}
-
- // Kept so clients built before answerToolCall keep working for a release.
- @Mutation(() => Boolean, {
- deprecationReason:
- "Use answerToolCall with the step's thread and the step id as toolCallId",
- })
- @UseGuards(CustomPermissionGuard)
- async submitFormStep(
- @Args('input') { stepId, workflowRunId, response }: SubmitFormStepInput,
- @AuthUserWorkspaceId() userWorkspaceId: string,
- @AuthWorkspaceMemberId() workspaceMemberId: string,
- @AuthWorkspace() workspace: WorkspaceEntity,
- ): Promise<boolean> {
- if (!isPlainObject(response)) {
- throw new AiException(
- 'A form response must be an object',
- AiExceptionCode.INVALID_TOOL_CALL_OUTPUT,
- );
- }
-
- await this.toolCallAnswerService.answerFormStep({
- workflowRunId,
- stepId,
- response,
- userWorkspaceId,
- workspaceMemberId,
- workspace,
- });
-
- return true;
- }
}
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-tool-call-answer/services/tool-call-answer.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-tool-call-answer/services/tool-call-answer.service.ts
index e3b5f0bf70a..b11732bbea2 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-tool-call-answer/services/tool-call-answer.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-tool-call-answer/services/tool-call-answer.service.ts
@@ -2,10 +2,8 @@ import { Injectable } from '@nestjs/common';
import { msg } from '@lingui/core/macro';
import { generateId } from 'ai';
-import { ASK_QUESTIONS_TOOL_NAME } from 'twenty-shared/ai';
import { PermissionFlagType } from 'twenty-shared/constants';
import { isDefined } from 'twenty-shared/utils';
-import { StepStatus } from 'twenty-shared/workflow';
import { isUserAuthContext } from 'src/engine/core-modules/auth/guards/is-user-auth-context.guard';
import { workspaceAuthContextStorage } from 'src/engine/core-modules/auth/storage/workspace-auth-context.storage';
@@ -13,7 +11,6 @@ import { ToolRegistryService } from 'src/engine/core-modules/tool-provider/servi
import { type ToolContext } from 'src/engine/core-modules/tool-provider/types/tool-context.type';
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 { REQUEST_FORM_PAUSING_TOOL } from 'src/engine/metadata-modules/ai/ai-agent-execution/pausing-tools/request-form.pausing-tool';
import { type PausingToolCompletionContext } from 'src/engine/metadata-modules/ai/ai-agent-execution/pausing-tools/types/pausing-tool-completion-context.type';
import { parsePausingToolCall } from 'src/engine/metadata-modules/ai/ai-agent-execution/pausing-tools/utils/parse-pausing-tool-call.util';
import { AgentActorContextService } from 'src/engine/metadata-modules/ai/ai-agent-execution/services/agent-actor-context.service';
@@ -25,7 +22,6 @@ import { AgentChatService } from 'src/engine/metadata-modules/ai/ai-chat/service
import { mapErrorToStreamError } from 'src/engine/metadata-modules/ai/ai-chat/utils/map-error-to-stream-error.util';
import { AgentHistoryRepository } from 'src/engine/metadata-modules/ai/ai-history/repositories/agent-history-repository';
import { InjectAgentHistoryRepository } from 'src/engine/metadata-modules/ai/ai-history/repositories/inject-agent-history-repository.decorator';
-import { AgentHistoryWorkspaceStorageService } from 'src/engine/metadata-modules/ai/ai-history/services/agent-history-workspace-storage.service';
import { type AgentChatThreadWorkspaceEntity } from 'src/engine/metadata-modules/ai/ai-history/standard-objects/agent-chat-thread.workspace-entity';
import {
AiException,
@@ -41,7 +37,6 @@ import {
type WorkflowRunWorkspaceEntity,
} from 'src/modules/workflow/common/standard-objects/workflow-run.workspace-entity';
import { type WorkflowAction } from 'src/modules/workflow/workflow-executor/workflow-actions/types/workflow-action.type';
-import { isWorkflowFormAction } from 'src/modules/workflow/workflow-executor/workflow-actions/form/guards/is-workflow-form-action.guard';
import { WorkflowRunWorkspaceService } from 'src/modules/workflow/workflow-runner/workflow-run/workflow-run.workspace-service';
import { WorkflowRunnerWorkspaceService } from 'src/modules/workflow/workflow-runner/workspace-services/workflow-runner.workspace-service';
@@ -82,7 +77,6 @@ export class ToolCallAnswerService {
private readonly workspaceCacheService: WorkspaceCacheService,
private readonly agentActorContextService: AgentActorContextService,
private readonly toolRegistryService: ToolRegistryService,
- private readonly agentHistoryWorkspaceStorageService: AgentHistoryWorkspaceStorageService,
) {}
async answer(args: AnswerToolCallArgs): Promise<AnswerToolCallOutcome> {
@@ -291,171 +285,6 @@ export class ToolCallAnswerService {
}
}
- // Runs created before conversations are available still need to accept answers.
- async answerFormStep({
- workflowRunId,
- stepId,
- ...args
- }: Omit<AnswerToolCallArgs, 'threadId' | 'toolCallId' | 'modelId'> & {
- workflowRunId: string;
- stepId: string;
- }): Promise<void> {
- await this.assertCanAnswerForWorkflowRun({
- workflowRunId,
- workspaceId: args.workspace.id,
- userWorkspaceId: args.userWorkspaceId,
- });
-
- const workflowRun = await this.workflowRunWorkspaceService.getWorkflowRun({
- workflowRunId,
- workspaceId: args.workspace.id,
- });
- const threadId = workflowRun?.state?.stepInfos?.[stepId]?.threadId;
-
- if (isDefined(threadId)) {
- await this.answer({ ...args, threadId, toolCallId: stepId });
-
- return;
- }
-
- // The pending-form backfill holds the history fence while reading and
- // rewriting runs. It must not overwrite an answer accepted in the meantime.
- const recordedThreadId = await this.agentHistoryWorkspaceStorageService.run(
- args.workspace.id,
- async () => {
- const currentRun =
- await this.workflowRunWorkspaceService.getWorkflowRun({
- workflowRunId,
- workspaceId: args.workspace.id,
- });
- const currentThreadId =
- currentRun?.state?.stepInfos?.[stepId]?.threadId;
-
- if (isDefined(currentThreadId)) {
- return currentThreadId;
- }
-
- await this.answerFormWithoutConversation({
- ...args,
- workflowRunId,
- stepId,
- workflowRun: currentRun,
- });
-
- return null;
- },
- { lockMode: 'exclusive' },
- );
-
- // Release the fence before the conversation answer takes its own history locks.
- if (isDefined(recordedThreadId)) {
- await this.answer({
- ...args,
- threadId: recordedThreadId,
- toolCallId: stepId,
- });
-
- return;
- }
-
- // The answer is already committed. Release the history fence before resuming
- // or failing the run, since failure closes its other waiting conversations.
- try {
- await this.workflowRunnerWorkspaceService.resume({
- workspaceId: args.workspace.id,
- workflowRunId,
- lastExecutedStepId: stepId,
- });
- } catch (error) {
- await this.workflowRunWorkspaceService.endWorkflowRun({
- workspaceId: args.workspace.id,
- workflowRunId,
- status: WorkflowRunStatus.FAILED,
- error: 'The run could not resume after its form was answered',
- });
-
- throw error;
- }
- }
-
- private async answerFormWithoutConversation({
- workflowRun,
- workflowRunId,
- stepId,
- ...args
- }: Omit<AnswerToolCallArgs, 'threadId' | 'toolCallId' | 'modelId'> & {
- workflowRun: WorkflowRunWorkspaceEntity | null;
- workflowRunId: string;
- stepId: string;
- }): Promise<void> {
- const stepInfo = workflowRun?.state?.stepInfos?.[stepId];
- const step = workflowRun?.state?.flow?.steps.find(
- ({ id }) => id === stepId,
- );
-
- if (
- workflowRun?.status !== WorkflowRunStatus.RUNNING ||
- stepInfo?.status !== StepStatus.PENDING ||
- isDefined(stepInfo.error) ||
- !isDefined(step) ||
- !isWorkflowFormAction(step)
- ) {
- throw this.notPending();
- }
-
- const formCall = REQUEST_FORM_PAUSING_TOOL.parseCall({
- fields: step.settings.input,
- });
-
- if (!isDefined(formCall)) {
- throw this.notPending();
- }
-
- const validation = formCall.validate(args.response);
-
- if (!validation.isValid) {
- throw new AiException(
- validation.errorMessage,
- AiExceptionCode.INVALID_TOOL_CALL_OUTPUT,
- );
- }
-
- const hasCompletedStep =
- await this.workflowRunnerWorkspaceService.completeFormStep({
- workspaceId: args.workspace.id,
- workflowRunId,
- step,
- expectedThreadId: null,
- response: validation.output,
- });
-
- if (!hasCompletedStep) {
- throw this.notPending();
- }
- }
-
- // Behind answerAgentChatQuestion, kept for clients built before
- // answerToolCall: a question is named by the message that asked it.
- async answerQuestionsOfMessage({
- messageId,
- ...args
- }: Omit<AnswerToolCallArgs, 'toolCallId'> & {
- messageId: string;
- }): Promise<AnswerToolCallOutcome> {
- const awaitingToolParts = await this.agentChatService.findAwaitingToolParts(
- { messageId, workspaceId: args.workspace.id },
- );
- const questionsPart = awaitingToolParts.find(
- (part) => part.toolName === ASK_QUESTIONS_TOOL_NAME,
- );
-
- if (!isDefined(questionsPart?.toolCallId)) {
- throw this.notPending();
- }
-
- return this.answer({ ...args, toolCallId: questionsPart.toolCallId });
- }
-
private async failAfterAnswer({
threadId,
workspaceId,
diff --git a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/ai-agent/services/workflow-agent-conversation.workspace-service.ts b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/ai-agent/services/workflow-agent-conversation.workspace-service.ts
index 9d0bca9a478..9e78c59c837 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/ai-agent/services/workflow-agent-conversation.workspace-service.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/ai-agent/services/workflow-agent-conversation.workspace-service.ts
@@ -26,8 +26,6 @@ import { findAwaitingPausingToolParts } from 'src/engine/metadata-modules/ai/ai-
import { buildRequestFormPendingOutput } from 'src/engine/metadata-modules/ai/ai-chat/tools/request-form.tool';
import { AgentHistoryRepository } from 'src/engine/metadata-modules/ai/ai-history/repositories/agent-history-repository';
import { InjectAgentHistoryRepository } from 'src/engine/metadata-modules/ai/ai-history/repositories/inject-agent-history-repository.decorator';
-import { hasWorkflowRunThreadFields } from 'src/engine/metadata-modules/ai/ai-history/utils/has-workflow-run-thread-fields.util';
-import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
import { WorkflowRunWorkspaceService } from 'src/modules/workflow/workflow-runner/workflow-run/workflow-run.workspace-service';
export type RecordedExecutionResult = {
@@ -56,7 +54,6 @@ export class WorkflowAgentConversationWorkspaceService {
private readonly messageRepository: AgentHistoryRepository<AgentMessageWorkspaceEntity>,
@InjectAgentHistoryRepository('agentMessagePart')
private readonly messagePartRepository: AgentHistoryRepository<AgentMessagePartEntity>,
- private readonly workspaceCacheService: WorkspaceCacheService,
private readonly workflowRunWorkspaceService: WorkflowRunWorkspaceService,
) {}
@@ -78,8 +75,8 @@ export class WorkflowAgentConversationWorkspaceService {
prompt: string;
initiatorUserWorkspaceId: string | null;
executionResult: RecordedExecutionResult;
- }): Promise<RecordedConversation | null> {
- const conversation = await this.openConversation({
+ }): Promise<RecordedConversation> {
+ const { threadId, turnId } = await this.openConversation({
workspaceId,
workflowRunId,
stepId,
@@ -87,12 +84,6 @@ export class WorkflowAgentConversationWorkspaceService {
agentId,
});
- if (!isDefined(conversation)) {
- return null;
- }
-
- const { threadId, turnId } = conversation;
-
await this.insertMessage({
workspaceId,
threadId,
@@ -129,7 +120,7 @@ export class WorkflowAgentConversationWorkspaceService {
title: string;
fields: RequestFormToolInput['fields'];
}): Promise<void> {
- const conversation = await this.openConversation({
+ const { threadId, turnId } = await this.openConversation({
workspaceId,
workflowRunId,
stepId,
@@ -137,12 +128,6 @@ export class WorkflowAgentConversationWorkspaceService {
agentId: null,
});
- if (!isDefined(conversation)) {
- return;
- }
-
- const { threadId, turnId } = conversation;
-
const messageId = await this.insertMessage({
workspaceId,
threadId,
@@ -272,7 +257,6 @@ export class WorkflowAgentConversationWorkspaceService {
return true;
}
- // Only a workspace whose conversations can name a run records one.
private async openConversation({
workspaceId,
workflowRunId,
@@ -285,16 +269,7 @@ export class WorkflowAgentConversationWorkspaceService {
stepId: string;
title: string;
agentId: string | null;
- }): Promise<{ threadId: string; turnId: string } | null> {
- const { flatFieldMetadataMaps } =
- await this.workspaceCacheService.getOrRecompute(workspaceId, [
- 'flatFieldMetadataMaps',
- ]);
-
- if (!hasWorkflowRunThreadFields(flatFieldMetadataMaps)) {
- return null;
- }
-
+ }): Promise<{ threadId: string; turnId: string }> {
const threadInsertResult = await this.threadRepository.insert(workspaceId, {
title,
workflowRunId,
diff --git a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/form/form.workflow-action.ts b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/form/form.workflow-action.ts
index e38bb19126d..45bffd5e51c 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/form/form.workflow-action.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/form/form.workflow-action.ts
@@ -35,8 +35,6 @@ export class FormWorkflowAction implements WorkflowAction {
);
}
- // A workspace 2.44 has not reached yet cannot record the conversation, and
- // its upgrade records one for every form still waiting.
await this.workflowAgentConversationService.recordFormRequest({
workspaceId: runInfo.workspaceId,
workflowRunId: runInfo.workflowRunId,
diff --git a/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-run/__tests__/workflow-run.workspace-service.conversation.spec.ts b/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-run/__tests__/workflow-run.workspace-service.conversation.spec.ts
index 18954692b9d..771ef894c45 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-run/__tests__/workflow-run.workspace-service.conversation.spec.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-run/__tests__/workflow-run.workspace-service.conversation.spec.ts
@@ -160,6 +160,16 @@ describe('WorkflowRunWorkspaceService conversations', () => {
'the step holds another conversation',
{ stepInfo: { status: StepStatus.PENDING, threadId: 'other-thread' } },
],
+ [
+ 'the step failed while waiting',
+ {
+ stepInfo: {
+ status: StepStatus.PENDING,
+ threadId: 'thread-id',
+ error: 'boom',
+ },
+ },
+ ],
])('claims nothing when %s', async (_description, overrides) => {
const { service, updateWorkflowRun } = buildService(overrides);
@@ -168,19 +178,18 @@ describe('WorkflowRunWorkspaceService conversations', () => {
});
});
- describe('form steps without a conversation', () => {
- const completeForm = (service: WorkflowRunWorkspaceService) =>
+ describe('updateStepInfoIfPending without an expected conversation', () => {
+ const claim = (service: WorkflowRunWorkspaceService) =>
service.updateStepInfoIfPending({
stepId: 'step-id',
- stepInfo: { status: StepStatus.SUCCESS, result: { name: 'Tim' } },
- expectedThreadId: null,
+ stepInfo: { status: StepStatus.SUCCESS },
workflowRunId: 'workflow-run-id',
workspaceId: 'workspace-id',
});
- it('completes a pending form exactly once', async () => {
+ it('claims a PENDING step whatever conversation it holds, only once', async () => {
const { service, updateWorkflowRun } = buildService({
- stepInfo: { status: StepStatus.PENDING },
+ stepInfo: { status: StepStatus.PENDING, threadId: 'other-thread' },
});
updateWorkflowRun.mockImplementation(async ({ partialUpdate }) => {
jest.spyOn(service, 'getWorkflowRunOrFail').mockResolvedValue({
@@ -190,33 +199,10 @@ describe('WorkflowRunWorkspaceService conversations', () => {
} as never);
});
- expect(await completeForm(service)).toBe(true);
- expect(await completeForm(service)).toBe(false);
+ expect(await claim(service)).toBe(true);
+ expect(await claim(service)).toBe(false);
expect(updateWorkflowRun).toHaveBeenCalledTimes(1);
});
-
- it.each([
- [
- 'a conversation was added',
- { stepInfo: { status: StepStatus.PENDING, threadId: 'new-thread' } },
- ],
- [
- 'the run stopped',
- {
- status: WorkflowRunStatus.STOPPED,
- stepInfo: { status: StepStatus.PENDING },
- },
- ],
- [
- 'the form failed',
- { stepInfo: { status: StepStatus.PENDING, error: 'failed' } },
- ],
- ])('does not complete when %s', async (_description, overrides) => {
- const { service, updateWorkflowRun } = buildService(overrides);
-
- expect(await completeForm(service)).toBe(false);
- expect(updateWorkflowRun).not.toHaveBeenCalled();
- });
});
describe('endWorkflowRun', () => {
diff --git a/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-run/workflow-run.workspace-service.ts b/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-run/workflow-run.workspace-service.ts
index fd56fb44cde..925e3afa1a4 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-run/workflow-run.workspace-service.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-run/workflow-run.workspace-service.ts
@@ -436,7 +436,7 @@ export class WorkflowRunWorkspaceService {
}: {
stepId: string;
stepInfo: Partial<WorkflowRunStepInfo>;
- expectedThreadId?: string | null;
+ expectedThreadId?: string;
workflowRunId: string;
workspaceId: string;
}): Promise<boolean> {
@@ -451,8 +451,8 @@ export class WorkflowRunWorkspaceService {
workflowRunToUpdate.status !== WorkflowRunStatus.RUNNING ||
currentStepInfo?.status !== StepStatus.PENDING ||
isDefined(currentStepInfo.error) ||
- (expectedThreadId !== undefined &&
- (currentStepInfo.threadId ?? null) !== expectedThreadId)
+ (isDefined(expectedThreadId) &&
+ currentStepInfo.threadId !== expectedThreadId)
) {
return false;
}
diff --git a/packages/twenty-server/src/modules/workflow/workflow-runner/workspace-services/workflow-runner.workspace-service.ts b/packages/twenty-server/src/modules/workflow/workflow-runner/workspace-services/workflow-runner.workspace-service.ts
index c9ef785f37b..50d8e7f9213 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-runner/workspace-services/workflow-runner.workspace-service.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-runner/workspace-services/workflow-runner.workspace-service.ts
@@ -10,10 +10,7 @@ import { MessageQueueService } from 'src/engine/core-modules/message-queue/servi
import { WorkflowRunStatus } from 'src/modules/workflow/common/standard-objects/workflow-run.workspace-entity';
import { workflowHasRunningSteps } from 'src/modules/workflow/common/utils/workflow-has-running-steps.util';
import { WorkflowVersionStepOperationsWorkspaceService } from 'src/modules/workflow/workflow-builder/workflow-version-step/workflow-version-step-operations.workspace-service';
-import {
- type WorkflowFormAction,
- type WorkflowAction,
-} from 'src/modules/workflow/workflow-executor/workflow-actions/types/workflow-action.type';
+import { type WorkflowAction } from 'src/modules/workflow/workflow-executor/workflow-actions/types/workflow-action.type';
import { isWorkflowFormAction } from 'src/modules/workflow/workflow-executor/workflow-actions/form/guards/is-workflow-form-action.guard';
import {
WorkflowRunException,
@@ -126,36 +123,6 @@ export class WorkflowRunnerWorkspaceService {
return;
}
- const hasCompletedStep = await this.completeFormStep({
- workspaceId,
- workflowRunId,
- step,
- expectedThreadId: threadId,
- response,
- });
-
- if (hasCompletedStep) {
- await this.resume({
- workspaceId,
- workflowRunId,
- lastExecutedStepId: step.id,
- });
- }
- }
-
- async completeFormStep({
- workspaceId,
- workflowRunId,
- step,
- expectedThreadId,
- response,
- }: {
- workspaceId: string;
- workflowRunId: string;
- step: WorkflowFormAction;
- expectedThreadId: string | null;
- response: Record<string, unknown>;
- }): Promise<boolean> {
const enrichedResponse =
await this.workflowVersionStepOperationsWorkspaceService.enrichFormStepResponse(
{
@@ -165,16 +132,25 @@ export class WorkflowRunnerWorkspaceService {
},
);
- return this.workflowRunWorkspaceService.updateStepInfoIfPending({
- stepId: step.id,
- stepInfo: {
- status: StepStatus.SUCCESS,
- result: enrichedResponse,
- },
- expectedThreadId,
- workspaceId,
- workflowRunId,
- });
+ const hasCompletedStep =
+ await this.workflowRunWorkspaceService.updateStepInfoIfPending({
+ stepId: step.id,
+ stepInfo: {
+ status: StepStatus.SUCCESS,
+ result: enrichedResponse,
+ },
+ expectedThreadId: threadId,
+ workspaceId,
+ workflowRunId,
+ });
+
+ if (hasCompletedStep) {
+ await this.resume({
+ workspaceId,
+ workflowRunId,
+ lastExecutedStepId: step.id,
+ });
+ }
}
async stopWorkflowRun(workspaceId: string, workflowRunId: string) {
diff --git a/packages/twenty-server/test/integration/graphql/suites/admin-panel/admin-chat-threads.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/admin-panel/admin-chat-threads.integration-spec.ts
index 7e4c869918e..7a3d48b10a1 100644
--- a/packages/twenty-server/test/integration/graphql/suites/admin-panel/admin-chat-threads.integration-spec.ts
+++ b/packages/twenty-server/test/integration/graphql/suites/admin-panel/admin-chat-threads.integration-spec.ts
@@ -4,7 +4,7 @@ import { randomUUID } from 'crypto';
import { gql } from 'graphql-tag';
import { type DataSource } from 'typeorm';
import { getAppProviderByClassName } from 'test/integration/utils/get-app-provider-by-class-name.util';
-import { type AgentHistoryStorageService } from 'src/engine/metadata-modules/ai/ai-history/services/agent-history-storage.service';
+import { type AgentHistoryUpgradeStorageService } from 'src/database/commands/agent-history/agent-history-upgrade-storage.service';
import { type AgentHistoryObjectName } from 'src/engine/metadata-modules/ai/ai-history/types/agent-history-object-name.type';
import { escapeIdentifier } from 'src/engine/workspace-manager/workspace-migration/utils/remove-sql-injection.util';
import { v5 } from 'uuid';
@@ -101,7 +101,7 @@ type ThreadsResult = {
describe('Admin panel global chat threads (integration)', () => {
let dataSource: DataSource;
- let storage: AgentHistoryStorageService;
+ let storage: AgentHistoryUpgradeStorageService;
let userWorkspaceId: string;
let workspaceMemberId: string;
let userEmail: string;
@@ -260,7 +260,7 @@ describe('Admin panel global chat threads (integration)', () => {
beforeAll(async () => {
dataSource = global.testDataSource;
- storage = getAppProviderByClassName<AgentHistoryStorageService>(
+ storage = getAppProviderByClassName<AgentHistoryUpgradeStorageService>(
'AgentHistoryUpgradeStorageService',
);
diff --git a/packages/twenty-server/test/integration/graphql/suites/ai-chat-answer-tool-call.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/ai-chat-answer-tool-call.integration-spec.ts
index e35efacc760..15cff978ac4 100644
--- a/packages/twenty-server/test/integration/graphql/suites/ai-chat-answer-tool-call.integration-spec.ts
+++ b/packages/twenty-server/test/integration/graphql/suites/ai-chat-answer-tool-call.integration-spec.ts
@@ -212,33 +212,6 @@ describe('Answering a chat tool call', () => {
);
});
- it('still answers a question through the deprecated answerAgentChatQuestion', async () => {
- const { assistantMessageId } = await pauseOnQuestions('call-legacy');
- enqueueStream.mockClear();
-
- const response = await makeMetadataApiRequest({
- query: parse(
- `mutation Answer($threadId: UUID!, $messageId: UUID!, $answers: [AgentChatQuestionAnswerInput!]!) {
- answerAgentChatQuestion(threadId: $threadId, messageId: $messageId, answers: $answers) { messageId queued streamId }
- }`,
- ),
- variables: {
- threadId,
- messageId: assistantMessageId,
- answers: [{ questionIndex: 0, selectedOptionIndices: [1] }],
- },
- });
-
- expect(response.body.errors).toBeUndefined();
- expect(response.body.data.answerAgentChatQuestion).toMatchObject({
- messageId: assistantMessageId,
- queued: false,
- streamId: expect.any(String),
- });
- expect(await readToolCallStatus('call-legacy')).toBe('answered');
- expect(enqueueStream).toHaveBeenCalledTimes(1);
- });
-
it('closes every pending call when a message is sent instead of the answers', async () => {
await pauseOnQuestions('call-skipped-first', 'call-skipped-last');
diff --git a/packages/twenty-server/test/integration/graphql/suites/chat-sender-execution.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/chat-sender-execution.integration-spec.ts
index 4db83709735..fbb0b9545d2 100644
--- a/packages/twenty-server/test/integration/graphql/suites/chat-sender-execution.integration-spec.ts
+++ b/packages/twenty-server/test/integration/graphql/suites/chat-sender-execution.integration-spec.ts
@@ -8,7 +8,7 @@ import { getCoreRepository } from 'test/integration/utils/get-core-repository.ut
import { makeMetadataApiRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';
import { type AgentChatService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-chat.service';
import { type AgentChatActorService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-chat-actor.service';
-import { type AgentHistoryStorageService } from 'src/engine/metadata-modules/ai/ai-history/services/agent-history-storage.service';
+import { type AgentHistoryUpgradeStorageService } from 'src/database/commands/agent-history/agent-history-upgrade-storage.service';
import { type AttributeChatMessageSendersCommand } from 'src/database/commands/upgrade-version-command/2-43/2-43-workspace-command-1790171503075-attribute-chat-message-senders.command';
import { UserWorkspaceEntity } from 'src/engine/core-modules/user-workspace/user-workspace.entity';
import { AgentMessageRole } from 'src/engine/metadata-modules/ai/ai-agent-execution/entities/agent-message.entity';
@@ -169,9 +169,10 @@ describe('Persisted chat senders', () => {
await command.up(args);
await command.up(args);
await command.down(args);
- const storage = getAppProviderByClassName<AgentHistoryStorageService>(
- 'AgentHistoryUpgradeStorageService',
- );
+ const storage =
+ getAppProviderByClassName<AgentHistoryUpgradeStorageService>(
+ 'AgentHistoryUpgradeStorageService',
+ );
const records = await storage.run(workspaceId, ({ manager, table }) =>
manager.query(
`SELECT id, "senderUserWorkspaceId" FROM ${table('agentMessage')} WHERE id = ANY($1::uuid[])`,
diff --git a/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/chat-thread-sharing.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/chat-thread-sharing.integration-spec.ts
index 5fc6bd76bf5..cae092965cb 100644
--- a/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/chat-thread-sharing.integration-spec.ts
+++ b/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/chat-thread-sharing.integration-spec.ts
@@ -15,14 +15,13 @@ import { type RecordShareStorageService } from 'src/engine/core-modules/record-s
import { type BillingSubscriptionService } from 'src/engine/core-modules/billing/services/billing-subscription.service';
import { type AddWorkflowRunToChatThreadsCommand } from 'src/database/commands/upgrade-version-command/2-44/2-44-workspace-command-1790607161319-add-workflow-run-to-chat-threads.command';
import { EnableCommonRecordSharingCommand } from 'src/database/commands/upgrade-version-command/2-43/2-43-workspace-command-1790312694997-enable-common-record-sharing.command';
-import { type AgentHistoryStorageService } from 'src/engine/metadata-modules/ai/ai-history/services/agent-history-storage.service';
+import { type AgentHistoryUpgradeStorageService } from 'src/database/commands/agent-history/agent-history-upgrade-storage.service';
import { type WorkspaceMigrationValidateBuildAndRunService } from 'src/engine/workspace-manager/workspace-migration/services/workspace-migration-validate-build-and-run-service';
import { randomUUID } from 'node:crypto';
import { parse } from 'graphql';
import { EVERYONE_PRINCIPAL_ID } from 'twenty-shared/constants';
import { type ObjectRecordDestroyEvent } from 'twenty-shared/database-events';
import {
- FeatureFlagKey,
RecordShareAccessLevel,
RecordSharePrincipalType,
RecordShareRowCause,
@@ -30,7 +29,6 @@ import {
import { isDefined } from 'twenty-shared/utils';
import { makeMetadataApiRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';
-import { updateFeatureFlag } from 'test/integration/metadata/suites/utils/update-feature-flag.util';
import { type WorkspaceEventEmitter } from 'src/engine/workspace-event-emitter/workspace-event-emitter';
import { getAppProviderByClassName } from 'test/integration/utils/get-app-provider-by-class-name.util';
import { type AgentChatService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-chat.service';
@@ -153,14 +151,11 @@ describe('Conversation sharing through the authenticated API', () => {
const cache = getAppProviderByClassName<WorkspaceCacheService>(
'WorkspaceCacheService',
);
- const { featureFlagsMap, userWorkspaceRoleMap, flatObjectMetadataMaps } =
+ const { userWorkspaceRoleMap, flatObjectMetadataMaps } =
await cache.getOrRecompute(workspaceId, [
- 'featureFlagsMap',
'userWorkspaceRoleMap',
'flatObjectMetadataMaps',
]);
- const previousEnabled =
- featureFlagsMap[FeatureFlagKey.IS_RECORD_SHARING_ENABLED] === true;
const roleId = userWorkspaceRoleMap[USER_WORKSPACE_DATA_SEED_IDS.JONY];
if (!isDefined(roleId)) {
throw new Error('Seeded recipient role is missing');
@@ -213,11 +208,6 @@ describe('Conversation sharing through the authenticated API', () => {
text: 'Private setup enrichment and workspace identity',
});
expect(kickoff.id).toBeDefined();
- await updateFeatureFlag({
- featureFlag: FeatureFlagKey.IS_RECORD_SHARING_ENABLED,
- value: true,
- expectToFail: false,
- });
expect((await read()).body.errors[0].extensions.code).toBe('NOT_FOUND');
expect(await listedThreadIds()).not.toContain(threadId);
expect((await changeShare(true)).body.errors).toBeUndefined();
@@ -308,11 +298,6 @@ describe('Conversation sharing through the authenticated API', () => {
expect((await read()).body.errors[0].extensions.code).toBe('NOT_FOUND');
} finally {
await destroyAgentChatThread({ threadId });
- await updateFeatureFlag({
- featureFlag: FeatureFlagKey.IS_RECORD_SHARING_ENABLED,
- value: previousEnabled,
- expectToFail: false,
- });
}
},
);
@@ -324,14 +309,11 @@ describe('Conversation sharing through the authenticated API', () => {
const cache = getAppProviderByClassName<WorkspaceCacheService>(
'WorkspaceCacheService',
);
- const { flatObjectMetadataMaps, userWorkspaceRoleMap, featureFlagsMap } =
+ const { flatObjectMetadataMaps, userWorkspaceRoleMap } =
await cache.getOrRecompute(workspaceId, [
'flatObjectMetadataMaps',
'userWorkspaceRoleMap',
- 'featureFlagsMap',
]);
- const previousEnabled =
- featureFlagsMap[FeatureFlagKey.IS_RECORD_SHARING_ENABLED] === true;
const owner = {
workspaceId,
userWorkspaceId: USER_WORKSPACE_DATA_SEED_IDS.JANE,
@@ -367,11 +349,6 @@ describe('Conversation sharing through the authenticated API', () => {
title: 'Multiplayer regression',
});
try {
- await updateFeatureFlag({
- featureFlag: FeatureFlagKey.IS_RECORD_SHARING_ENABLED,
- value: true,
- expectToFail: false,
- });
const grant = (accessLevel: RecordShareAccessLevel) =>
makeMetadataApiRequest({
query: SET_SHARE,
@@ -508,16 +485,11 @@ describe('Conversation sharing through the authenticated API', () => {
).toBe(false);
} finally {
await destroyAgentChatThread({ threadId });
- await updateFeatureFlag({
- featureFlag: FeatureFlagKey.IS_RECORD_SHARING_ENABLED,
- value: previousEnabled,
- expectToFail: false,
- });
}
},
);
- it('retains ownership through upgrade rollback and retry, including flag-off and soft deleted history', async () => {
+ it('retains ownership through upgrade rollback and retry, including soft deleted history', async () => {
const cache = getAppProviderByClassName<WorkspaceCacheService>(
'WorkspaceCacheService',
);
@@ -526,7 +498,7 @@ describe('Conversation sharing through the authenticated API', () => {
const command = new EnableCommonRecordSharingCommand(
{} as never,
cache,
- getAppProviderByClassName<AgentHistoryStorageService>(
+ getAppProviderByClassName<AgentHistoryUpgradeStorageService>(
'AgentHistoryUpgradeStorageService',
),
getAppProviderByClassName<WorkspaceMigrationValidateBuildAndRunService>(
@@ -546,9 +518,6 @@ describe('Conversation sharing through the authenticated API', () => {
};
const options = { workspaceId, options: { dryRun: false } } as never;
- const originalFlag =
- (await cache.getOrRecompute(workspaceId, ['featureFlagsMap']))
- .featureFlagsMap[FeatureFlagKey.IS_RECORD_SHARING_ENABLED] === true;
await chatService.createThread({
...owner,
id: owner.threadId,
@@ -559,11 +528,6 @@ describe('Conversation sharing through the authenticated API', () => {
expect((await readThread(owner.threadId)).body.errors).toBeUndefined();
await command.up(options);
await command.up(options);
- await updateFeatureFlag({
- featureFlag: FeatureFlagKey.IS_RECORD_SHARING_ENABLED,
- value: false,
- expectToFail: false,
- });
const readable = await readThread(owner.threadId);
expect(readable.body.errors).toBeUndefined();
expect(readable.body.data.recordPermissions[0].permissions).toEqual({
@@ -603,12 +567,6 @@ describe('Conversation sharing through the authenticated API', () => {
'AddWorkflowRunToChatThreadsCommand',
).up(options);
await destroyAgentChatThread({ threadId: owner.threadId });
-
- await updateFeatureFlag({
- featureFlag: FeatureFlagKey.IS_RECORD_SHARING_ENABLED,
- value: originalFlag,
- expectToFail: false,
- });
}
});
it('lets non-owner writers rename through ordinary permissions and denies them after revocation', async () => {
@@ -775,33 +733,6 @@ describe('Conversations through the record API', () => {
`SELECT "principalId", "principalType", "accessLevel", "rowCause" FROM ${schema}."recordShare" WHERE "recordId" = $1`,
[threadId],
);
- let previousRecordSharingEnabled = false;
-
- beforeAll(async () => {
- const cache = getAppProviderByClassName<WorkspaceCacheService>(
- 'WorkspaceCacheService',
- );
- const { featureFlagsMap } = await cache.getOrRecompute(
- SEED_APPLE_WORKSPACE_ID,
- ['featureFlagsMap'],
- );
- previousRecordSharingEnabled =
- featureFlagsMap[FeatureFlagKey.IS_RECORD_SHARING_ENABLED] === true;
- await updateFeatureFlag({
- featureFlag: FeatureFlagKey.IS_RECORD_SHARING_ENABLED,
- value: true,
- expectToFail: false,
- });
- });
-
- afterAll(async () => {
- await updateFeatureFlag({
- featureFlag: FeatureFlagKey.IS_RECORD_SHARING_ENABLED,
- value: previousRecordSharingEnabled,
- expectToFail: false,
- });
- });
-
it('reads a conversation with its relations even though its messages stay out of the API', async () => {
const chat =
getAppProviderByClassName<AgentChatService>('AgentChatService');
diff --git a/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/create-share-with-object-records-permissions.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/create-share-with-object-records-permissions.integration-spec.ts
index 2b691b80884..b51e20b2896 100644
--- a/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/create-share-with-object-records-permissions.integration-spec.ts
+++ b/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/create-share-with-object-records-permissions.integration-spec.ts
@@ -16,13 +16,11 @@ import { deleteOneObjectMetadata } from 'test/integration/metadata/suites/object
import { setObjectReadability } from 'test/integration/metadata/suites/object-metadata/utils/set-object-readability.util';
import { updateOneObjectMetadata } from 'test/integration/metadata/suites/object-metadata/utils/update-one-object-metadata.util';
import { findOneRoleByLabel } from 'test/integration/metadata/suites/role/utils/find-one-role-by-label.util';
-import { updateFeatureFlag } from 'test/integration/metadata/suites/utils/update-feature-flag.util';
import { deleteRecordsByIds } from 'test/integration/utils/delete-records-by-ids';
import { getAppProviderByClassName } from 'test/integration/utils/get-app-provider-by-class-name.util';
import { getCoreRepository } from 'test/integration/utils/get-core-repository.util';
import { EVERYONE_PRINCIPAL_ID } from 'twenty-shared/constants';
import {
- FeatureFlagKey,
FieldMetadataType,
MetadataReadability,
RecordShareAccessLevel,
@@ -141,13 +139,6 @@ const apiKeyRoleRowFor = (recordId: string, roleId: string) => ({
sourceId: recordId,
});
-const setRecordSharingEnabled = (value: boolean) =>
- updateFeatureFlag({
- featureFlag: FeatureFlagKey.IS_RECORD_SHARING_ENABLED,
- value,
- expectToFail: false,
- });
-
describe('createShareWithObjectRecordsPermissions', () => {
let recordShareStorageService: RecordShareStorageService;
let objectMetadataId: string;
@@ -231,8 +222,6 @@ describe('createShareWithObjectRecordsPermissions', () => {
});
afterAll(async () => {
- await setRecordSharingEnabled(false);
-
const recordShareIds = (
await Promise.all(createdRecordIds.map(findRecordShares))
)
@@ -265,10 +254,9 @@ describe('createShareWithObjectRecordsPermissions', () => {
});
});
- describe('PRIVATE readability with record sharing enabled', () => {
+ describe('PRIVATE readability', () => {
beforeAll(async () => {
await setObjectReadability(objectMetadataId, MetadataReadability.PRIVATE);
- await setRecordSharingEnabled(true);
});
it('should give the creating member a FULL owner row when no shareWith is passed', async () => {
@@ -669,7 +657,7 @@ describe('createShareWithObjectRecordsPermissions', () => {
});
describe.each([MetadataReadability.SYSTEM, MetadataReadability.PRIVATE])(
- 'PRIVATE creates with the flag off and conversation readability %s',
+ 'PRIVATE creates with conversation readability %s',
(conversationReadability) => {
let conversationObjectMetadata: ObjectMetadataEntity;
@@ -691,7 +679,6 @@ describe('createShareWithObjectRecordsPermissions', () => {
objectMetadataId,
MetadataReadability.PRIVATE,
);
- await setRecordSharingEnabled(false);
});
afterAll(async () => {
@@ -701,7 +688,7 @@ describe('createShareWithObjectRecordsPermissions', () => {
);
});
- it('requires an explicit API sharing target regardless of rollout state', async () => {
+ it('requires an explicit API sharing target', async () => {
const recordId = trackRecordId();
const response = await makeGraphqlApiRequestWithApiKey(
createOneOperation({
@@ -715,11 +702,11 @@ describe('createShareWithObjectRecordsPermissions', () => {
expect(await findRecordShares(recordId)).toEqual([]);
});
- it('keeps new member records private regardless of rollout state', async () => {
+ it('keeps new member records private', async () => {
const recordId = trackRecordId();
const response = await makeGraphqlApiRequest(
createOneOperation({
- data: { id: recordId, name: 'Member create with flag off' },
+ data: { id: recordId, name: 'Member create' },
}),
);
expect(response.body.errors).toBeUndefined();
diff --git a/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/inherited-readability-object-records-permissions.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/inherited-readability-object-records-permissions.integration-spec.ts
index 80315863872..fc07afc6f87 100644
--- a/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/inherited-readability-object-records-permissions.integration-spec.ts
+++ b/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/inherited-readability-object-records-permissions.integration-spec.ts
@@ -11,11 +11,9 @@ import { makeGraphqlApiRequest } from 'test/integration/graphql/utils/make-graph
import { updateOneOperationFactory } from 'test/integration/graphql/utils/update-one-operation-factory.util';
import { setObjectReadability } from 'test/integration/metadata/suites/object-metadata/utils/set-object-readability.util';
import { findOneRoleByLabel } from 'test/integration/metadata/suites/role/utils/find-one-role-by-label.util';
-import { updateFeatureFlag } from 'test/integration/metadata/suites/utils/update-feature-flag.util';
import { getAppProviderByClassName } from 'test/integration/utils/get-app-provider-by-class-name.util';
import { getCoreRepository } from 'test/integration/utils/get-core-repository.util';
import {
- FeatureFlagKey,
MetadataReadability,
RecordShareAccessLevel,
RecordSharePrincipalType,
@@ -92,13 +90,6 @@ const findNoteWithChildrenOperation = findManyOperationFactory({
filter: { id: { eq: NOTE_ID } },
});
-const setRecordSharingEnabled = (value: boolean) =>
- updateFeatureFlag({
- featureFlag: FeatureFlagKey.IS_RECORD_SHARING_ENABLED,
- value,
- expectToFail: false,
- });
-
const destroyRecords = ({
objectMetadataSingularName,
objectMetadataPluralName,
@@ -126,7 +117,6 @@ describe('inheritedReadabilityObjectRecordsPermissions', () => {
const sourceId = randomUUID();
beforeAll(async () => {
- await setRecordSharingEnabled(true);
recordShareStorageService =
getAppProviderByClassName<RecordShareStorageService>(
'RecordShareStorageService',
@@ -218,7 +208,6 @@ describe('inheritedReadabilityObjectRecordsPermissions', () => {
});
afterAll(async () => {
- await setRecordSharingEnabled(false);
await recordShareStorageService.deleteBySourceId({
workspaceId: SEED_APPLE_WORKSPACE_ID,
sourceId,
@@ -254,34 +243,6 @@ describe('inheritedReadabilityObjectRecordsPermissions', () => {
});
});
- describe('with record sharing disabled', () => {
- beforeAll(async () => {
- await setRecordSharingEnabled(false);
- });
-
- afterAll(async () => {
- await setRecordSharingEnabled(true);
- });
-
- it('keeps inherited record visibility enforced when the sharing UI is disabled', async () => {
- const attachmentsResponse = await makeGraphqlApiRequestWithMemberRole(
- findAttachmentsOperation,
- );
- const noteTargetsResponse = await makeGraphqlApiRequestWithMemberRole(
- findNoteTargetsOperation,
- );
-
- expect(attachmentsResponse.body.errors).toBeUndefined();
- expect(
- collectIds(attachmentsResponse.body.data.attachments.edges),
- ).toEqual([PERSON_ATTACHMENT_ID]);
- expect(noteTargetsResponse.body.errors).toBeUndefined();
- expect(
- collectIds(noteTargetsResponse.body.data.noteTargets.edges),
- ).toEqual([NOTE_TARGET_ID]);
- });
- });
-
describe('without a share row on the note', () => {
it('should hide the attachment hanging off the note and keep the note target that points at the open person', async () => {
const attachmentsResponse = await makeGraphqlApiRequestWithMemberRole(
diff --git a/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/inherited-through-children-readability-object-records-permissions.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/inherited-through-children-readability-object-records-permissions.integration-spec.ts
index b6a406492b3..ea2860dffcd 100644
--- a/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/inherited-through-children-readability-object-records-permissions.integration-spec.ts
+++ b/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/inherited-through-children-readability-object-records-permissions.integration-spec.ts
@@ -19,11 +19,9 @@ import { updateOneOperationFactory } from 'test/integration/graphql/utils/update
import { setObjectReadability } from 'test/integration/metadata/suites/object-metadata/utils/set-object-readability.util';
import { upsertObjectPermissions } from 'test/integration/metadata/suites/object-permission/utils/upsert-object-permissions.util';
import { findOneRoleByLabel } from 'test/integration/metadata/suites/role/utils/find-one-role-by-label.util';
-import { updateFeatureFlag } from 'test/integration/metadata/suites/utils/update-feature-flag.util';
import { getAppProviderByClassName } from 'test/integration/utils/get-app-provider-by-class-name.util';
import { getCoreRepository } from 'test/integration/utils/get-core-repository.util';
import {
- FeatureFlagKey,
MetadataReadability,
RecordShareAccessLevel,
RecordSharePrincipalType,
@@ -145,13 +143,6 @@ const reattachNoteOnBothToCompanyOperation = restoreManyOperationFactory({
filter: { id: { eq: BOTH_COMPANY_NOTE_TARGET_ID } },
});
-const setRecordSharingEnabled = (value: boolean) =>
- updateFeatureFlag({
- featureFlag: FeatureFlagKey.IS_RECORD_SHARING_ENABLED,
- value,
- expectToFail: false,
- });
-
const destroyRecords = ({
objectMetadataSingularName,
objectMetadataPluralName,
@@ -179,7 +170,6 @@ describe('inheritedThroughChildrenReadabilityObjectRecordsPermissions', () => {
const sourceId = randomUUID();
beforeAll(async () => {
- await setRecordSharingEnabled(true);
recordShareStorageService =
getAppProviderByClassName<RecordShareStorageService>(
'RecordShareStorageService',
@@ -314,7 +304,6 @@ describe('inheritedThroughChildrenReadabilityObjectRecordsPermissions', () => {
});
afterAll(async () => {
- await setRecordSharingEnabled(false);
await recordShareStorageService.deleteBySourceId({
workspaceId: SEED_APPLE_WORKSPACE_ID,
sourceId,
@@ -503,15 +492,11 @@ describe('inheritedThroughChildrenReadabilityObjectRecordsPermissions', () => {
expect(restoreResponse.body.errors).toBeDefined();
expect(restoreResponse.body.errors[0].message).toContain('not writable');
- await setRecordSharingEnabled(false);
-
const reattachResponse = await makeGraphqlApiRequest(
reattachNoteOnBothToCompanyOperation,
);
expect(reattachResponse.body.errors).toBeUndefined();
-
- await setRecordSharingEnabled(true);
});
it('should not show a deleted note in the trash through a target detached before its deletion', async () => {
@@ -904,8 +889,6 @@ describe('inheritedThroughChildrenReadabilityObjectRecordsPermissions', () => {
}),
);
- await setRecordSharingEnabled(false);
-
const deleteResponse = await makeGraphqlApiRequest(
deleteManyOperationFactory({
objectMetadataSingularName: 'note',
@@ -915,8 +898,6 @@ describe('inheritedThroughChildrenReadabilityObjectRecordsPermissions', () => {
}),
);
- await setRecordSharingEnabled(true);
-
const trashedNotesResponse = await makeGraphqlApiRequestWithMemberRole(
findManyOperationFactory({
objectMetadataSingularName: 'note',
@@ -929,8 +910,6 @@ describe('inheritedThroughChildrenReadabilityObjectRecordsPermissions', () => {
}),
);
- await setRecordSharingEnabled(false);
-
const restoreNoteResponse = await makeGraphqlApiRequest(
restoreManyOperationFactory({
objectMetadataSingularName: 'note',
@@ -948,8 +927,6 @@ describe('inheritedThroughChildrenReadabilityObjectRecordsPermissions', () => {
}),
);
- await setRecordSharingEnabled(true);
-
expect(detachResponse.body.data.deleteNoteTargets).toEqual([
{ id: COMPANY_NOTE_TARGET_ID },
]);
diff --git a/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/readability-object-records-permissions.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/readability-object-records-permissions.integration-spec.ts
index fc0a3f7ddad..d45400c2557 100644
--- a/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/readability-object-records-permissions.integration-spec.ts
+++ b/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/readability-object-records-permissions.integration-spec.ts
@@ -22,12 +22,10 @@ import { setObjectReadability } from 'test/integration/metadata/suites/object-me
import { updateOneObjectMetadata } from 'test/integration/metadata/suites/object-metadata/utils/update-one-object-metadata.util';
import { upsertObjectPermissions } from 'test/integration/metadata/suites/object-permission/utils/upsert-object-permissions.util';
import { findOneRoleByLabel } from 'test/integration/metadata/suites/role/utils/find-one-role-by-label.util';
-import { updateFeatureFlag } from 'test/integration/metadata/suites/utils/update-feature-flag.util';
import { getAppProviderByClassName } from 'test/integration/utils/get-app-provider-by-class-name.util';
import { getCoreRepository } from 'test/integration/utils/get-core-repository.util';
import { EVERYONE_PRINCIPAL_ID } from 'twenty-shared/constants';
import {
- FeatureFlagKey,
FieldMetadataType,
MetadataReadability,
RecordShareAccessLevel,
@@ -102,13 +100,6 @@ const totalCountOperation = {
variables: { filter: ALL_RECORDS_FILTER },
};
-const setRecordSharingEnabled = (value: boolean) =>
- updateFeatureFlag({
- featureFlag: FeatureFlagKey.IS_RECORD_SHARING_ENABLED,
- value,
- expectToFail: false,
- });
-
describe('readabilityObjectRecordsPermissions', () => {
let recordShareStorageService: RecordShareStorageService;
let objectMetadataId: string;
@@ -253,7 +244,6 @@ describe('readabilityObjectRecordsPermissions', () => {
});
afterAll(async () => {
- await setRecordSharingEnabled(false);
await recordShareStorageService.deleteBySourceId({
workspaceId: SEED_APPLE_WORKSPACE_ID,
sourceId,
@@ -283,10 +273,9 @@ describe('readabilityObjectRecordsPermissions', () => {
});
});
- describe('PRIVATE readability with record sharing enabled', () => {
+ describe('PRIVATE readability', () => {
beforeAll(async () => {
await setObjectReadability(objectMetadataId, MetadataReadability.PRIVATE);
- await setRecordSharingEnabled(true);
});
it('should only return records shared with the admin principals', async () => {
@@ -556,10 +545,9 @@ describe('readabilityObjectRecordsPermissions', () => {
});
});
- describe('SYSTEM readability with record sharing enabled', () => {
+ describe('SYSTEM readability', () => {
beforeAll(async () => {
await setObjectReadability(objectMetadataId, MetadataReadability.SYSTEM);
- await setRecordSharingEnabled(true);
});
it('should refuse reads even for an admin', async () => {
@@ -569,36 +557,4 @@ describe('readabilityObjectRecordsPermissions', () => {
expect(response.body.errors[0].message).toContain('not readable');
});
});
-
- describe('PRIVATE readability with record sharing disabled', () => {
- beforeAll(async () => {
- await setObjectReadability(objectMetadataId, MetadataReadability.PRIVATE);
- await setRecordSharingEnabled(false);
-
- const response = await makeGraphqlApiRequest(
- createOneOperationFactory({
- objectMetadataSingularName: OBJECT_SINGULAR,
- gqlFields: RECORD_GQL_FIELDS,
- data: {
- id: RECORD_IDS.SHARED_FULL_WITH_EVERYONE,
- name: 'SHARED_FULL_WITH_EVERYONE',
- },
- }),
- );
-
- expect(response.body.errors).toBeUndefined();
- });
-
- it('keeps grants enforced with the sharing UI disabled', async () => {
- const response = await makeGraphqlApiRequest(findManyOperation);
-
- expect(response.body.errors).toBeUndefined();
- expect(collectIds(response.body.data[OBJECT_PLURAL].edges)).toEqual(
- [
- RECORD_IDS.SHARED_FULL_WITH_EVERYONE,
- RECORD_IDS.SHARED_FULL_WITH_ADMIN_ROLE,
- ].sort(),
- );
- });
- });
});
diff --git a/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/record-share-object.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/record-share-object.integration-spec.ts
index 67b0e5ff8fe..141bec0009e 100644
--- a/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/record-share-object.integration-spec.ts
+++ b/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/record-share-object.integration-spec.ts
@@ -15,11 +15,9 @@ import { randomUUID } from 'node:crypto';
import { createOneOperationFactory } from 'test/integration/graphql/utils/create-one-operation-factory.util';
import { findManyOperationFactory } from 'test/integration/graphql/utils/find-many-operation-factory.util';
import { makeGraphqlApiRequest } from 'test/integration/graphql/utils/make-graphql-api-request.util';
-import { updateFeatureFlag } from 'test/integration/metadata/suites/utils/update-feature-flag.util';
import { getAppProviderByClassName } from 'test/integration/utils/get-app-provider-by-class-name.util';
import { getCoreRepository } from 'test/integration/utils/get-core-repository.util';
import {
- FeatureFlagKey,
RecordShareAccessLevel,
RecordSharePrincipalType,
RecordShareRowCause,
@@ -67,11 +65,6 @@ describe('recordShare object', () => {
});
afterAll(async () => {
- await updateFeatureFlag({
- featureFlag: FeatureFlagKey.IS_RECORD_SHARING_ENABLED,
- value: false,
- expectToFail: false,
- });
await recordShareStorageService.deleteBySourceId({
workspaceId: SEED_APPLE_WORKSPACE_ID,
sourceId,
@@ -236,27 +229,18 @@ describe('recordShare object', () => {
}
});
- it.each([false, true])(
- 'refuses reads through the GraphQL API even for an admin when record sharing is %s',
- async (isRecordSharingEnabled) => {
- await updateFeatureFlag({
- featureFlag: FeatureFlagKey.IS_RECORD_SHARING_ENABLED,
- value: isRecordSharingEnabled,
- expectToFail: false,
- });
-
- const response = await makeGraphqlApiRequest(
- findManyOperationFactory({
- objectMetadataSingularName: 'recordShare',
- objectMetadataPluralName: 'recordShares',
- gqlFields: 'id',
- }),
- );
+ it('refuses reads through the GraphQL API even for an admin', async () => {
+ const response = await makeGraphqlApiRequest(
+ findManyOperationFactory({
+ objectMetadataSingularName: 'recordShare',
+ objectMetadataPluralName: 'recordShares',
+ gqlFields: 'id',
+ }),
+ );
- expect(response.body.errors).toBeDefined();
- expect(response.body.errors[0].message).toContain('not readable');
- },
- );
+ expect(response.body.errors).toBeDefined();
+ expect(response.body.errors[0].message).toContain('not readable');
+ });
it('refuses creation through the GraphQL API even for an admin', async () => {
const response = await makeGraphqlApiRequest(
diff --git a/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/record-share-twin-object-records-permissions.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/record-share-twin-object-records-permissions.integration-spec.ts
index 1479bc7e88a..a3c82b4d779 100644
--- a/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/record-share-twin-object-records-permissions.integration-spec.ts
+++ b/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/record-share-twin-object-records-permissions.integration-spec.ts
@@ -15,11 +15,9 @@ import { deleteOneObjectMetadata } from 'test/integration/metadata/suites/object
import { setObjectReadability } from 'test/integration/metadata/suites/object-metadata/utils/set-object-readability.util';
import { updateOneObjectMetadata } from 'test/integration/metadata/suites/object-metadata/utils/update-one-object-metadata.util';
import { findOneRoleByLabel } from 'test/integration/metadata/suites/role/utils/find-one-role-by-label.util';
-import { updateFeatureFlag } from 'test/integration/metadata/suites/utils/update-feature-flag.util';
import { getAppProviderByClassName } from 'test/integration/utils/get-app-provider-by-class-name.util';
import { EVERYONE_PRINCIPAL_ID } from 'twenty-shared/constants';
import {
- FeatureFlagKey,
FieldMetadataType,
MetadataReadability,
RecordShareAccessLevel,
@@ -67,13 +65,6 @@ const findManyOperation = findManyOperationFactory({
filter: ALL_RECORDS_FILTER,
});
-const setRecordSharingEnabled = (value: boolean) =>
- updateFeatureFlag({
- featureFlag: FeatureFlagKey.IS_RECORD_SHARING_ENABLED,
- value,
- expectToFail: false,
- });
-
describe('recordShareTwinObjectRecordsPermissions', () => {
let recordShareStorageService: RecordShareStorageService;
let objectMetadataId: string;
@@ -202,11 +193,9 @@ describe('recordShareTwinObjectRecordsPermissions', () => {
});
await setObjectReadability(objectMetadataId, MetadataReadability.PRIVATE);
- await setRecordSharingEnabled(true);
});
afterAll(async () => {
- await setRecordSharingEnabled(false);
await recordShareStorageService.deleteBySourceId({
workspaceId: SEED_APPLE_WORKSPACE_ID,
sourceId,
diff --git a/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/record-sharing-api.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/record-sharing-api.integration-spec.ts
index d2047dc428f..051dd71df5b 100644
--- a/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/record-sharing-api.integration-spec.ts
+++ b/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/record-sharing-api.integration-spec.ts
@@ -11,7 +11,6 @@ import { escapeIdentifier } from 'src/engine/workspace-manager/workspace-migrati
import { randomUUID } from 'node:crypto';
import { parse } from 'graphql';
import {
- FeatureFlagKey,
FieldMetadataType,
MetadataReadability,
MetadataWritability,
@@ -33,7 +32,6 @@ import { updateOneObjectMetadata } from 'test/integration/metadata/suites/object
import { upsertObjectPermissions } from 'test/integration/metadata/suites/object-permission/utils/upsert-object-permissions.util';
import { findOneRoleByLabel } from 'test/integration/metadata/suites/role/utils/find-one-role-by-label.util';
import { makeMetadataApiRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';
-import { updateFeatureFlag } from 'test/integration/metadata/suites/utils/update-feature-flag.util';
import { getAppProviderByClassName } from 'test/integration/utils/get-app-provider-by-class-name.util';
import { type RecordSharePrincipalInput } from 'src/engine/core-modules/record-share/dtos/record-sharing.dto';
@@ -54,17 +52,10 @@ const READ_SHARING = parse(
const SET_SHARE = parse(
`mutation SetShare($target: RecordSharingTargetInput!, $principal: RecordSharePrincipalInput!, $enabled: Boolean!, $accessLevel: RecordShareAccessLevel) { setRecordShare(target: $target, principal: $principal, enabled: $enabled, accessLevel: $accessLevel) { ${fields} } }`,
);
-const setFlag = (value: boolean) =>
- updateFeatureFlag({
- featureFlag: FeatureFlagKey.IS_RECORD_SHARING_ENABLED,
- value,
- expectToFail: false,
- });
describe('Generic sharing API on an ordinary private object', () => {
let objectMetadataId: string;
let memberRoleId: string;
- let originalFlag: boolean;
let shares: RecordShareStorageService;
const target = () => ({ objectMetadataId, recordId: RECORD_ID });
const grant = async (
@@ -162,13 +153,6 @@ describe('Generic sharing API on an ordinary private object', () => {
shares = getAppProviderByClassName<RecordShareStorageService>(
'RecordShareStorageService',
);
- const cache = getAppProviderByClassName<WorkspaceCacheService>(
- 'WorkspaceCacheService',
- );
- originalFlag =
- (await cache.getOrRecompute(workspaceId, ['featureFlagsMap']))
- .featureFlagsMap[FeatureFlagKey.IS_RECORD_SHARING_ENABLED] === true;
- await setFlag(true);
const { data } = await createOneObjectMetadata({
input: {
nameSingular: OBJECT_NAME,
@@ -205,7 +189,6 @@ describe('Generic sharing API on an ordinary private object', () => {
});
beforeEach(async () => {
- await setFlag(true);
await shares.deleteByRecordIds({
workspaceId,
objectMetadataId,
@@ -250,17 +233,15 @@ describe('Generic sharing API on an ordinary private object', () => {
expectToFail: false,
});
await deleteOneObjectMetadata({ input: { idToDelete: objectMetadataId } });
- await setFlag(originalFlag);
});
- it('keeps creates private independently of the retired sharing flag', async () => {
- await setFlag(false);
+ it('keeps creates private', async () => {
const recordId = randomUUID();
const created = await makeGraphqlApiRequest(
createOneOperationFactory({
objectMetadataSingularName: OBJECT_NAME,
gqlFields: 'id',
- data: { id: recordId, name: 'Private with sharing UI disabled' },
+ data: { id: recordId, name: 'Private create' },
}),
);
expect(created.body.errors).toBeUndefined();
@@ -297,7 +278,6 @@ describe('Generic sharing API on an ordinary private object', () => {
filter: { id: { eq: recordId } },
}),
);
- await setFlag(true);
}
});
@@ -627,9 +607,8 @@ describe('Generic sharing API on an ordinary private object', () => {
}
});
- it('enforces saved grants independently of the retired sharing flag', async () => {
+ it('enforces saved grants', async () => {
await grant(RecordShareAccessLevel.READ);
- await setFlag(false);
expect((await read()).body.data[OBJECT_PLURAL].edges).toHaveLength(1);
expect(
(await settings(APPLE_JANE_ADMIN_ACCESS_TOKEN)).body.data.recordSharing,
diff --git a/packages/twenty-server/test/integration/graphql/suites/workflow/core-workflow-execution.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/workflow/core-workflow-execution.integration-spec.ts
index 1fee5e9a477..c5057a6028e 100644
--- a/packages/twenty-server/test/integration/graphql/suites/workflow/core-workflow-execution.integration-spec.ts
+++ b/packages/twenty-server/test/integration/graphql/suites/workflow/core-workflow-execution.integration-spec.ts
@@ -785,53 +785,6 @@ describe('core workflow execution and queue compatibility (e2e)', () => {
response: { answer },
});
- it('still answers a form through the deprecated submitFormStep', async () => {
- const finalStep = emptyStep();
- const form = formStep([finalStep.id]);
- const fixture = await createFixture({
- mirrorless: true,
- steps: [form, finalStep],
- });
- const runId = await runFixture(fixture);
-
- await waitForStep(runId, form.id, 'PENDING');
-
- const response = await workflowGraphqlRequest(
- 'mutation Submit($input: SubmitFormStepInput!) { submitFormStep(input: $input) }',
- {
- input: {
- stepId: form.id,
- workflowRunId: runId,
- response: { answer: 'Approved' },
- },
- },
- );
-
- expect(response.body.errors).toBeUndefined();
- expect(response.body.data.submitFormStep).toBe(true);
-
- const run = await waitForRun(runId, 'COMPLETED');
-
- expect(run.state.stepInfos[form.id].result).toMatchObject({
- answer: 'Approved',
- });
-
- const second = await workflowGraphqlRequest(
- 'mutation Submit($input: SubmitFormStepInput!) { submitFormStep(input: $input) }',
- {
- input: {
- stepId: form.id,
- workflowRunId: runId,
- response: { answer: 'Rejected' },
- },
- },
- );
-
- expect(JSON.stringify(second.body.errors)).toContain(
- 'TOOL_CALL_NOT_PENDING',
- );
- });
-
describe('the conversation a form step records', () => {
const approvalForm = (nextStepIds: string[]): WorkflowAction => ({
...formStep(nextStepIds),
diff --git a/packages/twenty-server/test/integration/upgrade/suites/2-42-workspace-command-1789914239896-migrate-agent-history-to-workspace.integration-spec.ts b/packages/twenty-server/test/integration/upgrade/suites/2-42-workspace-command-1789914239896-migrate-agent-history-to-workspace.integration-spec.ts
index 0a3319d209b..00fe4cbf2a0 100644
--- a/packages/twenty-server/test/integration/upgrade/suites/2-42-workspace-command-1789914239896-migrate-agent-history-to-workspace.integration-spec.ts
+++ b/packages/twenty-server/test/integration/upgrade/suites/2-42-workspace-command-1789914239896-migrate-agent-history-to-workspace.integration-spec.ts
@@ -17,8 +17,8 @@ import { type UpgradeCommandRegistryService } from 'src/engine/core-modules/upgr
import { type WorkspaceCommandRunnerService } from 'src/engine/core-modules/upgrade/services/workspace-command-runner.service';
import { UserWorkspaceEntity } from 'src/engine/core-modules/user-workspace/user-workspace.entity';
import { type AgentChatStreamHeartbeatService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-chat-stream-heartbeat.service';
-import { AGENT_HISTORY_STORAGE_KEY } from 'src/engine/metadata-modules/ai/ai-history/constants/agent-history-storage-key.constant';
-import { type AgentHistoryStorageService } from 'src/engine/metadata-modules/ai/ai-history/services/agent-history-storage.service';
+import { AGENT_HISTORY_MIGRATION_STORAGE_KEY } from 'src/database/commands/agent-history/agent-history-migration-storage-key.constant';
+import { type AgentHistoryUpgradeStorageService } from 'src/database/commands/agent-history/agent-history-upgrade-storage.service';
import { type WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';
import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';
import { type WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
@@ -71,7 +71,7 @@ describe('versioned agent history upgrade (integration)', () => {
let command: MigrateAgentHistoryToWorkspaceCommand;
let dataSource: DataSource;
let workspaceOrmManager: WorkspaceOrmManager;
- let storage: AgentHistoryStorageService;
+ let storage: AgentHistoryUpgradeStorageService;
let heartbeat: AgentChatStreamHeartbeatService;
let upgradeRunner: WorkspaceCommandRunnerService;
let upgradeCommandName: string;
@@ -108,7 +108,7 @@ describe('versioned agent history upgrade (integration)', () => {
workspaceOrmManager = getAppProviderByClassName<WorkspaceOrmManager>(
'WorkspaceOrmManager',
);
- storage = getAppProviderByClassName<AgentHistoryStorageService>(
+ storage = getAppProviderByClassName<AgentHistoryUpgradeStorageService>(
'AgentHistoryUpgradeStorageService',
);
heartbeat = getAppProviderByClassName<AgentChatStreamHeartbeatService>(
@@ -204,7 +204,7 @@ describe('versioned agent history upgrade (integration)', () => {
);
await dataSource.query(
'DELETE FROM core."keyValuePair" WHERE "workspaceId" = $1 AND key = $2',
- [WORKSPACE_ID, AGENT_HISTORY_STORAGE_KEY],
+ [WORKSPACE_ID, AGENT_HISTORY_MIGRATION_STORAGE_KEY],
);
await getAppProviderByClassName<WorkspaceCacheService>(
'WorkspaceCacheService',
@@ -309,7 +309,7 @@ describe('versioned agent history upgrade (integration)', () => {
expect(
await dataSource.query(
'SELECT 1 FROM core."keyValuePair" WHERE "workspaceId" = $1 AND key = $2',
- [workspaceId, AGENT_HISTORY_STORAGE_KEY],
+ [workspaceId, AGENT_HISTORY_MIGRATION_STORAGE_KEY],
),
).toHaveLength(0);
expect(
@@ -338,7 +338,7 @@ describe('versioned agent history upgrade (integration)', () => {
await expect(command.up(args)).rejects.toThrow(/schema is missing/i);
await dataSource.query(
'DELETE FROM core."keyValuePair" WHERE "workspaceId" = $1 AND key = $2',
- [workspaceId, AGENT_HISTORY_STORAGE_KEY],
+ [workspaceId, AGENT_HISTORY_MIGRATION_STORAGE_KEY],
);
await dataSource.query(
`INSERT INTO core."userWorkspace" (id, "workspaceId", "userId")
diff --git a/packages/twenty-shared/src/types/FeatureFlagKey.ts b/packages/twenty-shared/src/types/FeatureFlagKey.ts
index 59e5acce793..084490de35e 100644
--- a/packages/twenty-shared/src/types/FeatureFlagKey.ts
+++ b/packages/twenty-shared/src/types/FeatureFlagKey.ts
@@ -8,7 +8,6 @@ export enum FeatureFlagKey {
IS_REST_METADATA_API_NEW_FORMAT_DIRECT = 'IS_REST_METADATA_API_NEW_FORMAT_DIRECT',
IS_LOGIC_FUNCTION_PREBUILT_MODE_ENABLED = 'IS_LOGIC_FUNCTION_PREBUILT_MODE_ENABLED',
IS_WORKFLOW_CORE_INDEX_PAGE_ENABLED = 'IS_WORKFLOW_CORE_INDEX_PAGE_ENABLED',
- IS_RECORD_SHARING_ENABLED = 'IS_RECORD_SHARING_ENABLED',
IS_AI_CHAT_SHARING_DROPDOWN_ENABLED = 'IS_AI_CHAT_SHARING_DROPDOWN_ENABLED',
IS_INITIAL_OBJECT_VIEW_ENABLED = 'IS_INITIAL_OBJECT_VIEW_ENABLED',
IS_WEBHOOK_RATE_LIMIT_ENABLED = 'IS_WEBHOOK_RATE_LIMIT_ENABLED',