diff --git a/packages/twenty-front/src/generated-metadata/graphql.ts b/packages/twenty-front/src/generated-metadata/graphql.ts
index a0fec64e4d3..1e90440a875 100644
--- a/packages/twenty-front/src/generated-metadata/graphql.ts
+++ b/packages/twenty-front/src/generated-metadata/graphql.ts
@@ -53,6 +53,7 @@ export type Agent = {
   applicationId?: Maybe<Scalars['UUID']>;
   createdAt: Scalars['DateTime'];
   description?: Maybe<Scalars['String']>;
+  evaluationInputs: Array<Scalars['String']>;
   icon?: Maybe<Scalars['String']>;
   id: Scalars['UUID'];
   isCustom: Scalars['Boolean'];
@@ -67,17 +68,32 @@ export type Agent = {
   updatedAt: Scalars['DateTime'];
 };
 
-export type AgentChatMessage = {
-  __typename?: 'AgentChatMessage';
+export type AgentChatThread = {
+  __typename?: 'AgentChatThread';
   createdAt: Scalars['DateTime'];
   id: Scalars['UUID'];
-  parts: Array<AgentChatMessagePart>;
-  role: Scalars['String'];
-  threadId: Scalars['UUID'];
+  title?: Maybe<Scalars['String']>;
+  updatedAt: Scalars['DateTime'];
 };
 
-export type AgentChatMessagePart = {
-  __typename?: 'AgentChatMessagePart';
+export type AgentIdInput = {
+  /** The id of the agent. */
+  id: Scalars['UUID'];
+};
+
+export type AgentMessage = {
+  __typename?: 'AgentMessage';
+  agentId?: Maybe<Scalars['UUID']>;
+  createdAt: Scalars['DateTime'];
+  id: Scalars['UUID'];
+  parts: Array<AgentMessagePart>;
+  role: Scalars['String'];
+  threadId: Scalars['UUID'];
+  turnId: Scalars['UUID'];
+};
+
+export type AgentMessagePart = {
+  __typename?: 'AgentMessagePart';
   createdAt: Scalars['DateTime'];
   errorDetails?: Maybe<Scalars['JSON']>;
   errorMessage?: Maybe<Scalars['String']>;
@@ -105,17 +121,23 @@ export type AgentChatMessagePart = {
   type: Scalars['String'];
 };
 
-export type AgentChatThread = {
-  __typename?: 'AgentChatThread';
+export type AgentTurn = {
+  __typename?: 'AgentTurn';
+  agentId?: Maybe<Scalars['UUID']>;
   createdAt: Scalars['DateTime'];
+  evaluations: Array<AgentTurnEvaluation>;
   id: Scalars['UUID'];
-  title?: Maybe<Scalars['String']>;
-  updatedAt: Scalars['DateTime'];
+  messages: Array<AgentMessage>;
+  threadId: Scalars['UUID'];
 };
 
-export type AgentIdInput = {
-  /** The id of the agent. */
+export type AgentTurnEvaluation = {
+  __typename?: 'AgentTurnEvaluation';
+  comment?: Maybe<Scalars['String']>;
+  createdAt: Scalars['DateTime'];
   id: Scalars['UUID'];
+  score: Scalars['Int'];
+  turnId: Scalars['UUID'];
 };
 
 export type AggregateChartConfiguration = {
@@ -751,6 +773,7 @@ export type CoreViewSort = {
 
 export type CreateAgentInput = {
   description?: InputMaybe<Scalars['String']>;
+  evaluationInputs?: InputMaybe<Array<Scalars['String']>>;
   icon?: InputMaybe<Scalars['String']>;
   label: Scalars['String'];
   modelConfiguration?: InputMaybe<Scalars['JSON']>;
@@ -1830,6 +1853,7 @@ export type Mutation = {
   emailPasswordResetLink: EmailPasswordResetLinkOutput;
   enablePostgresProxy: PostgresCredentials;
   endSubscriptionTrialPeriod: BillingEndTrialPeriodOutput;
+  evaluateAgentTurn: AgentTurnEvaluation;
   executeOneServerlessFunction: ServerlessFunctionExecutionResult;
   generateApiKeyToken: ApiKeyToken;
   generateTransientToken: TransientTokenOutput;
@@ -1850,6 +1874,7 @@ export type Mutation = {
   restorePageLayoutWidget: PageLayoutWidget;
   retryJobs: RetryJobsResponse;
   revokeApiKey?: Maybe<ApiKey>;
+  runEvaluationInput: AgentTurn;
   runWorkflowVersion: RunWorkflowVersionOutput;
   saveImapSmtpCaldavAccount: ImapSmtpCaldavConnectionSuccess;
   sendInvitations: SendInvitationsOutput;
@@ -2380,6 +2405,11 @@ export type MutationEmailPasswordResetLinkArgs = {
 };
 
 
+export type MutationEvaluateAgentTurnArgs = {
+  turnId: Scalars['UUID'];
+};
+
+
 export type MutationExecuteOneServerlessFunctionArgs = {
   input: ExecuteServerlessFunctionInput;
 };
@@ -2484,6 +2514,12 @@ export type MutationRevokeApiKeyArgs = {
 };
 
 
+export type MutationRunEvaluationInputArgs = {
+  agentId: Scalars['UUID'];
+  input: Scalars['String'];
+};
+
+
 export type MutationRunWorkflowVersionArgs = {
   input: RunWorkflowVersionInput;
 };
@@ -3084,6 +3120,7 @@ export enum PermissionFlagType {
   DATA_MODEL = 'DATA_MODEL',
   DOWNLOAD_FILE = 'DOWNLOAD_FILE',
   EXPORT_CSV = 'EXPORT_CSV',
+  HTTP_REQUEST_TOOL = 'HTTP_REQUEST_TOOL',
   IMPERSONATE = 'IMPERSONATE',
   IMPORT_CSV = 'IMPORT_CSV',
   LAYOUTS = 'LAYOUTS',
@@ -3172,10 +3209,11 @@ export type PublishServerlessFunctionInput = {
 
 export type Query = {
   __typename?: 'Query';
+  agentTurns: Array<AgentTurn>;
   apiKey?: Maybe<ApiKey>;
   apiKeys: Array<ApiKey>;
   billingPortalSession: BillingSessionOutput;
-  chatMessages: Array<AgentChatMessage>;
+  chatMessages: Array<AgentMessage>;
   chatThread: AgentChatThread;
   chatThreads: Array<AgentChatThread>;
   checkUserExists: CheckUserExistOutput;
@@ -3257,6 +3295,11 @@ export type Query = {
 };
 
 
+export type QueryAgentTurnsArgs = {
+  agentId: Scalars['UUID'];
+};
+
+
 export type QueryApiKeyArgs = {
   input: GetApiKeyInput;
 };
@@ -4124,6 +4167,7 @@ export type UuidFilterComparison = {
 
 export type UpdateAgentInput = {
   description?: InputMaybe<Scalars['String']>;
+  evaluationInputs?: InputMaybe<Array<Scalars['String']>>;
   icon?: InputMaybe<Scalars['String']>;
   id: Scalars['UUID'];
   label?: InputMaybe<Scalars['String']>;
@@ -4904,7 +4948,7 @@ export type WorkspaceUrlsAndId = {
   workspaceUrls: WorkspaceUrls;
 };
 
-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, applicationId?: 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 AssignRoleToAgentMutationVariables = Exact<{
   agentId: Scalars['UUID'];
@@ -4924,14 +4968,21 @@ export type CreateOneAgentMutationVariables = Exact<{
 }>;
 
 
-export type CreateOneAgentMutation = { __typename?: 'Mutation', createOneAgent: { __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, applicationId?: string | null, createdAt: string, updatedAt: string } };
+export type CreateOneAgentMutation = { __typename?: 'Mutation', createOneAgent: { __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 DeleteOneAgentMutationVariables = Exact<{
   input: AgentIdInput;
 }>;
 
 
-export type DeleteOneAgentMutation = { __typename?: 'Mutation', deleteOneAgent: { __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, applicationId?: string | null, createdAt: string, updatedAt: string } };
+export type DeleteOneAgentMutation = { __typename?: 'Mutation', deleteOneAgent: { __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 EvaluateAgentTurnMutationVariables = Exact<{
+  turnId: Scalars['UUID'];
+}>;
+
+
+export type EvaluateAgentTurnMutation = { __typename?: 'Mutation', evaluateAgentTurn: { __typename?: 'AgentTurnEvaluation', id: string, turnId: string, score: number, comment?: string | null, createdAt: string } };
 
 export type RemoveRoleFromAgentMutationVariables = Exact<{
   agentId: Scalars['UUID'];
@@ -4940,31 +4991,46 @@ export type RemoveRoleFromAgentMutationVariables = Exact<{
 
 export type RemoveRoleFromAgentMutation = { __typename?: 'Mutation', removeRoleFromAgent: boolean };
 
+export type RunEvaluationInputMutationVariables = Exact<{
+  agentId: Scalars['UUID'];
+  input: Scalars['String'];
+}>;
+
+
+export type RunEvaluationInputMutation = { __typename?: 'Mutation', runEvaluationInput: { __typename?: 'AgentTurn', id: string, threadId: string, agentId?: string | null, createdAt: string, evaluations: Array<{ __typename?: 'AgentTurnEvaluation', id: string, score: number, comment?: string | null, createdAt: string }> } };
+
 export type UpdateOneAgentMutationVariables = Exact<{
   input: UpdateAgentInput;
 }>;
 
 
-export type UpdateOneAgentMutation = { __typename?: 'Mutation', updateOneAgent: { __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, applicationId?: string | null, createdAt: string, updatedAt: string } };
+export type UpdateOneAgentMutation = { __typename?: 'Mutation', updateOneAgent: { __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 FindManyAgentsQueryVariables = Exact<{ [key: string]: never; }>;
 
 
-export type FindManyAgentsQuery = { __typename?: 'Query', findManyAgents: Array<{ __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, applicationId?: string | null, createdAt: string, updatedAt: string }> };
+export type FindManyAgentsQuery = { __typename?: 'Query', findManyAgents: Array<{ __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 FindOneAgentQueryVariables = Exact<{
   id: Scalars['UUID'];
 }>;
 
 
-export type FindOneAgentQuery = { __typename?: 'Query', findOneAgent: { __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, applicationId?: string | null, createdAt: string, updatedAt: string } };
+export type FindOneAgentQuery = { __typename?: 'Query', findOneAgent: { __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 GetAgentTurnsQueryVariables = Exact<{
+  agentId: Scalars['UUID'];
+}>;
+
+
+export type GetAgentTurnsQuery = { __typename?: 'Query', agentTurns: Array<{ __typename?: 'AgentTurn', id: string, threadId: string, agentId?: string | null, createdAt: string, evaluations: Array<{ __typename?: 'AgentTurnEvaluation', id: string, score: number, comment?: string | null, createdAt: string }>, messages: Array<{ __typename?: 'AgentMessage', id: string, role: string, createdAt: string, parts: Array<{ __typename?: 'AgentMessagePart', id: string, type: string, textContent?: string | null, reasoningContent?: string | null, toolName?: string | null, toolCallId?: string | null, toolInput?: any | null, toolOutput?: any | null, errorMessage?: string | null, state?: string | null, errorDetails?: any | null, sourceUrlSourceId?: string | null, sourceUrlUrl?: string | null, sourceUrlTitle?: string | null, sourceDocumentSourceId?: string | null, sourceDocumentMediaType?: string | null, sourceDocumentTitle?: string | null, sourceDocumentFilename?: string | null, fileMediaType?: string | null, fileFilename?: string | null, fileUrl?: string | null, providerMetadata?: any | null }> }> }> };
 
 export type GetChatMessagesQueryVariables = Exact<{
   threadId: Scalars['UUID'];
 }>;
 
 
-export type GetChatMessagesQuery = { __typename?: 'Query', chatMessages: Array<{ __typename?: 'AgentChatMessage', id: string, threadId: string, role: string, createdAt: string, parts: Array<{ __typename?: 'AgentChatMessagePart', id: string, messageId: string, orderIndex: number, type: string, textContent?: string | null, reasoningContent?: string | null, toolName?: string | null, toolCallId?: string | null, toolInput?: any | null, toolOutput?: any | null, state?: string | null, errorMessage?: string | null, errorDetails?: any | null, sourceUrlSourceId?: string | null, sourceUrlUrl?: string | null, sourceUrlTitle?: string | null, sourceDocumentSourceId?: string | null, sourceDocumentMediaType?: string | null, sourceDocumentTitle?: string | null, sourceDocumentFilename?: string | null, fileMediaType?: string | null, fileFilename?: string | null, fileUrl?: string | null, providerMetadata?: any | null, createdAt: string }> }> };
+export type GetChatMessagesQuery = { __typename?: 'Query', chatMessages: Array<{ __typename?: 'AgentMessage', id: string, threadId: string, turnId: string, role: string, createdAt: string, parts: Array<{ __typename?: 'AgentMessagePart', id: string, messageId: string, orderIndex: number, type: string, textContent?: string | null, reasoningContent?: string | null, toolName?: string | null, toolCallId?: string | null, toolInput?: any | null, toolOutput?: any | null, state?: string | null, errorMessage?: string | null, errorDetails?: any | null, sourceUrlSourceId?: string | null, sourceUrlUrl?: string | null, sourceUrlTitle?: string | null, sourceDocumentSourceId?: string | null, sourceDocumentMediaType?: string | null, sourceDocumentTitle?: string | null, sourceDocumentFilename?: string | null, fileMediaType?: string | null, fileFilename?: string | null, fileUrl?: string | null, providerMetadata?: any | null, createdAt: string }> }> };
 
 export type GetChatThreadsQueryVariables = Exact<{ [key: string]: never; }>;
 
@@ -4990,7 +5056,7 @@ export type UpdateOneApplicationVariableMutationVariables = Exact<{
 
 export type UpdateOneApplicationVariableMutation = { __typename?: 'Mutation', updateOneApplicationVariable: boolean };
 
-export type ApplicationFieldsFragment = { __typename?: 'Application', id: string, name: string, description: string, version: string, universalIdentifier: string, canBeUninstalled: boolean, applicationVariables: Array<{ __typename?: 'ApplicationVariable', id: string, key: string, value: string, description: string, isSecret: boolean }>, agents: Array<{ __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, applicationId?: string | null, createdAt: string, updatedAt: string }>, objects: Array<{ __typename?: 'Object', id: string, nameSingular: string, namePlural: string, labelSingular: string, labelPlural: string, description?: string | null, icon?: string | null, isCustom: boolean, isRemote: boolean, isActive: boolean, isSystem: boolean, isUIReadOnly: boolean, createdAt: string, updatedAt: string, labelIdentifierFieldMetadataId?: string | null, imageIdentifierFieldMetadataId?: string | null, applicationId?: string | null, shortcut?: string | null, isLabelSyncedWithName: boolean, isSearchable: boolean, duplicateCriteria?: Array<Array<string>> | null, indexMetadataList: Array<{ __typename?: 'Index', id: string, createdAt: string, updatedAt: string, name: string, indexWhereClause?: string | null, indexType: IndexType, isUnique: boolean, isCustom?: boolean | null, indexFieldMetadataList: Array<{ __typename?: 'IndexField', id: string, fieldMetadataId: string, createdAt: string, updatedAt: string, order: number }> }>, fieldsList: Array<{ __typename?: 'Field', id: string, type: FieldMetadataType, name: string, label: string, description?: string | null, icon?: string | null, isCustom?: boolean | null, isActive?: boolean | null, isSystem?: boolean | null, isUIReadOnly?: boolean | null, isNullable?: boolean | null, isUnique?: boolean | null, createdAt: string, updatedAt: string, defaultValue?: any | null, options?: any | null, settings?: any | null, isLabelSyncedWithName?: boolean | null, relation?: { __typename?: 'Relation', type: RelationType, sourceObjectMetadata: { __typename?: 'Object', id: string, nameSingular: string, namePlural: string }, targetObjectMetadata: { __typename?: 'Object', id: string, nameSingular: string, namePlural: string }, sourceFieldMetadata: { __typename?: 'Field', id: string, name: string }, targetFieldMetadata: { __typename?: 'Field', id: string, name: string } } | null, morphRelations?: Array<{ __typename?: 'Relation', type: RelationType, sourceObjectMetadata: { __typename?: 'Object', id: string, nameSingular: string, namePlural: string }, targetObjectMetadata: { __typename?: 'Object', id: string, nameSingular: string, namePlural: string }, sourceFieldMetadata: { __typename?: 'Field', id: string, name: string }, targetFieldMetadata: { __typename?: 'Field', id: string, name: string } }> | null }> }>, serverlessFunctions: Array<{ __typename?: 'ServerlessFunction', id: string, name: string, description?: string | null, runtime: string, timeoutSeconds: number, latestVersion?: string | null, publishedVersions: Array<string>, handlerPath: string, handlerName: string, createdAt: string, updatedAt: string, cronTriggers?: Array<{ __typename?: 'CronTrigger', id: string, settings: any, createdAt: string, updatedAt: string }> | null, databaseEventTriggers?: Array<{ __typename?: 'DatabaseEventTrigger', id: string, settings: any, createdAt: string, updatedAt: string }> | null, routeTriggers?: Array<{ __typename?: 'RouteTrigger', id: string, path: string, isAuthRequired: boolean, httpMethod: HttpMethod, createdAt: string, updatedAt: string }> | null }> };
+export type ApplicationFieldsFragment = { __typename?: 'Application', id: string, name: string, description: string, version: string, universalIdentifier: string, canBeUninstalled: boolean, applicationVariables: Array<{ __typename?: 'ApplicationVariable', id: string, key: string, value: string, description: string, isSecret: boolean }>, agents: Array<{ __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 }>, objects: Array<{ __typename?: 'Object', id: string, nameSingular: string, namePlural: string, labelSingular: string, labelPlural: string, description?: string | null, icon?: string | null, isCustom: boolean, isRemote: boolean, isActive: boolean, isSystem: boolean, isUIReadOnly: boolean, createdAt: string, updatedAt: string, labelIdentifierFieldMetadataId?: string | null, imageIdentifierFieldMetadataId?: string | null, applicationId?: string | null, shortcut?: string | null, isLabelSyncedWithName: boolean, isSearchable: boolean, duplicateCriteria?: Array<Array<string>> | null, indexMetadataList: Array<{ __typename?: 'Index', id: string, createdAt: string, updatedAt: string, name: string, indexWhereClause?: string | null, indexType: IndexType, isUnique: boolean, isCustom?: boolean | null, indexFieldMetadataList: Array<{ __typename?: 'IndexField', id: string, fieldMetadataId: string, createdAt: string, updatedAt: string, order: number }> }>, fieldsList: Array<{ __typename?: 'Field', id: string, type: FieldMetadataType, name: string, label: string, description?: string | null, icon?: string | null, isCustom?: boolean | null, isActive?: boolean | null, isSystem?: boolean | null, isUIReadOnly?: boolean | null, isNullable?: boolean | null, isUnique?: boolean | null, createdAt: string, updatedAt: string, defaultValue?: any | null, options?: any | null, settings?: any | null, isLabelSyncedWithName?: boolean | null, relation?: { __typename?: 'Relation', type: RelationType, sourceObjectMetadata: { __typename?: 'Object', id: string, nameSingular: string, namePlural: string }, targetObjectMetadata: { __typename?: 'Object', id: string, nameSingular: string, namePlural: string }, sourceFieldMetadata: { __typename?: 'Field', id: string, name: string }, targetFieldMetadata: { __typename?: 'Field', id: string, name: string } } | null, morphRelations?: Array<{ __typename?: 'Relation', type: RelationType, sourceObjectMetadata: { __typename?: 'Object', id: string, nameSingular: string, namePlural: string }, targetObjectMetadata: { __typename?: 'Object', id: string, nameSingular: string, namePlural: string }, sourceFieldMetadata: { __typename?: 'Field', id: string, name: string }, targetFieldMetadata: { __typename?: 'Field', id: string, name: string } }> | null }> }>, serverlessFunctions: Array<{ __typename?: 'ServerlessFunction', id: string, name: string, description?: string | null, runtime: string, timeoutSeconds: number, latestVersion?: string | null, publishedVersions: Array<string>, handlerPath: string, handlerName: string, createdAt: string, updatedAt: string, cronTriggers?: Array<{ __typename?: 'CronTrigger', id: string, settings: any, createdAt: string, updatedAt: string }> | null, databaseEventTriggers?: Array<{ __typename?: 'DatabaseEventTrigger', id: string, settings: any, createdAt: string, updatedAt: string }> | null, routeTriggers?: Array<{ __typename?: 'RouteTrigger', id: string, path: string, isAuthRequired: boolean, httpMethod: HttpMethod, createdAt: string, updatedAt: string }> | null }> };
 
 export type FindManyApplicationsQueryVariables = Exact<{ [key: string]: never; }>;
 
@@ -5002,7 +5068,7 @@ export type FindOneApplicationQueryVariables = Exact<{
 }>;
 
 
-export type FindOneApplicationQuery = { __typename?: 'Query', findOneApplication: { __typename?: 'Application', id: string, name: string, description: string, version: string, universalIdentifier: string, canBeUninstalled: boolean, applicationVariables: Array<{ __typename?: 'ApplicationVariable', id: string, key: string, value: string, description: string, isSecret: boolean }>, agents: Array<{ __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, applicationId?: string | null, createdAt: string, updatedAt: string }>, objects: Array<{ __typename?: 'Object', id: string, nameSingular: string, namePlural: string, labelSingular: string, labelPlural: string, description?: string | null, icon?: string | null, isCustom: boolean, isRemote: boolean, isActive: boolean, isSystem: boolean, isUIReadOnly: boolean, createdAt: string, updatedAt: string, labelIdentifierFieldMetadataId?: string | null, imageIdentifierFieldMetadataId?: string | null, applicationId?: string | null, shortcut?: string | null, isLabelSyncedWithName: boolean, isSearchable: boolean, duplicateCriteria?: Array<Array<string>> | null, indexMetadataList: Array<{ __typename?: 'Index', id: string, createdAt: string, updatedAt: string, name: string, indexWhereClause?: string | null, indexType: IndexType, isUnique: boolean, isCustom?: boolean | null, indexFieldMetadataList: Array<{ __typename?: 'IndexField', id: string, fieldMetadataId: string, createdAt: string, updatedAt: string, order: number }> }>, fieldsList: Array<{ __typename?: 'Field', id: string, type: FieldMetadataType, name: string, label: string, description?: string | null, icon?: string | null, isCustom?: boolean | null, isActive?: boolean | null, isSystem?: boolean | null, isUIReadOnly?: boolean | null, isNullable?: boolean | null, isUnique?: boolean | null, createdAt: string, updatedAt: string, defaultValue?: any | null, options?: any | null, settings?: any | null, isLabelSyncedWithName?: boolean | null, relation?: { __typename?: 'Relation', type: RelationType, sourceObjectMetadata: { __typename?: 'Object', id: string, nameSingular: string, namePlural: string }, targetObjectMetadata: { __typename?: 'Object', id: string, nameSingular: string, namePlural: string }, sourceFieldMetadata: { __typename?: 'Field', id: string, name: string }, targetFieldMetadata: { __typename?: 'Field', id: string, name: string } } | null, morphRelations?: Array<{ __typename?: 'Relation', type: RelationType, sourceObjectMetadata: { __typename?: 'Object', id: string, nameSingular: string, namePlural: string }, targetObjectMetadata: { __typename?: 'Object', id: string, nameSingular: string, namePlural: string }, sourceFieldMetadata: { __typename?: 'Field', id: string, name: string }, targetFieldMetadata: { __typename?: 'Field', id: string, name: string } }> | null }> }>, serverlessFunctions: Array<{ __typename?: 'ServerlessFunction', id: string, name: string, description?: string | null, runtime: string, timeoutSeconds: number, latestVersion?: string | null, publishedVersions: Array<string>, handlerPath: string, handlerName: string, createdAt: string, updatedAt: string, cronTriggers?: Array<{ __typename?: 'CronTrigger', id: string, settings: any, createdAt: string, updatedAt: string }> | null, databaseEventTriggers?: Array<{ __typename?: 'DatabaseEventTrigger', id: string, settings: any, createdAt: string, updatedAt: string }> | null, routeTriggers?: Array<{ __typename?: 'RouteTrigger', id: string, path: string, isAuthRequired: boolean, httpMethod: HttpMethod, createdAt: string, updatedAt: string }> | null }> } };
+export type FindOneApplicationQuery = { __typename?: 'Query', findOneApplication: { __typename?: 'Application', id: string, name: string, description: string, version: string, universalIdentifier: string, canBeUninstalled: boolean, applicationVariables: Array<{ __typename?: 'ApplicationVariable', id: string, key: string, value: string, description: string, isSecret: boolean }>, agents: Array<{ __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 }>, objects: Array<{ __typename?: 'Object', id: string, nameSingular: string, namePlural: string, labelSingular: string, labelPlural: string, description?: string | null, icon?: string | null, isCustom: boolean, isRemote: boolean, isActive: boolean, isSystem: boolean, isUIReadOnly: boolean, createdAt: string, updatedAt: string, labelIdentifierFieldMetadataId?: string | null, imageIdentifierFieldMetadataId?: string | null, applicationId?: string | null, shortcut?: string | null, isLabelSyncedWithName: boolean, isSearchable: boolean, duplicateCriteria?: Array<Array<string>> | null, indexMetadataList: Array<{ __typename?: 'Index', id: string, createdAt: string, updatedAt: string, name: string, indexWhereClause?: string | null, indexType: IndexType, isUnique: boolean, isCustom?: boolean | null, indexFieldMetadataList: Array<{ __typename?: 'IndexField', id: string, fieldMetadataId: string, createdAt: string, updatedAt: string, order: number }> }>, fieldsList: Array<{ __typename?: 'Field', id: string, type: FieldMetadataType, name: string, label: string, description?: string | null, icon?: string | null, isCustom?: boolean | null, isActive?: boolean | null, isSystem?: boolean | null, isUIReadOnly?: boolean | null, isNullable?: boolean | null, isUnique?: boolean | null, createdAt: string, updatedAt: string, defaultValue?: any | null, options?: any | null, settings?: any | null, isLabelSyncedWithName?: boolean | null, relation?: { __typename?: 'Relation', type: RelationType, sourceObjectMetadata: { __typename?: 'Object', id: string, nameSingular: string, namePlural: string }, targetObjectMetadata: { __typename?: 'Object', id: string, nameSingular: string, namePlural: string }, sourceFieldMetadata: { __typename?: 'Field', id: string, name: string }, targetFieldMetadata: { __typename?: 'Field', id: string, name: string } } | null, morphRelations?: Array<{ __typename?: 'Relation', type: RelationType, sourceObjectMetadata: { __typename?: 'Object', id: string, nameSingular: string, namePlural: string }, targetObjectMetadata: { __typename?: 'Object', id: string, nameSingular: string, namePlural: string }, sourceFieldMetadata: { __typename?: 'Field', id: string, name: string }, targetFieldMetadata: { __typename?: 'Field', id: string, name: string } }> | null }> }>, serverlessFunctions: Array<{ __typename?: 'ServerlessFunction', id: string, name: string, description?: string | null, runtime: string, timeoutSeconds: number, latestVersion?: string | null, publishedVersions: Array<string>, handlerPath: string, handlerName: string, createdAt: string, updatedAt: string, cronTriggers?: Array<{ __typename?: 'CronTrigger', id: string, settings: any, createdAt: string, updatedAt: string }> | null, databaseEventTriggers?: Array<{ __typename?: 'DatabaseEventTrigger', id: string, settings: any, createdAt: string, updatedAt: string }> | null, routeTriggers?: Array<{ __typename?: 'RouteTrigger', id: string, path: string, isAuthRequired: boolean, httpMethod: HttpMethod, createdAt: string, updatedAt: string }> | null }> } };
 
 export type UploadFileMutationVariables = Exact<{
   file: Scalars['Upload'];
@@ -5782,7 +5848,7 @@ export type UpsertPermissionFlagsMutation = { __typename?: 'Mutation', upsertPer
 export type GetRolesQueryVariables = Exact<{ [key: string]: never; }>;
 
 
-export type GetRolesQuery = { __typename?: 'Query', getRoles: Array<{ __typename?: 'Role', id: string, label: string, description?: string | null, icon?: string | null, canUpdateAllSettings: boolean, canAccessAllTools: boolean, isEditable: boolean, canReadAllObjectRecords: boolean, canUpdateAllObjectRecords: boolean, canSoftDeleteAllObjectRecords: boolean, canDestroyAllObjectRecords: boolean, canBeAssignedToUsers: boolean, canBeAssignedToAgents: boolean, canBeAssignedToApiKeys: boolean, workspaceMembers: Array<{ __typename?: 'WorkspaceMember', id: string, avatarUrl?: string | null, userEmail: string, name: { __typename?: 'FullName', firstName: string, lastName: string } }>, agents: Array<{ __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, applicationId?: string | null, createdAt: string, updatedAt: string }>, apiKeys: Array<{ __typename?: 'ApiKeyForRole', id: string, name: string, expiresAt: string, revokedAt?: string | null }>, permissionFlags?: Array<{ __typename?: 'PermissionFlag', id: string, flag: PermissionFlagType, roleId: string }> | null, objectPermissions?: Array<{ __typename?: 'ObjectPermission', objectMetadataId: string, canReadObjectRecords?: boolean | null, canUpdateObjectRecords?: boolean | null, canSoftDeleteObjectRecords?: boolean | null, canDestroyObjectRecords?: boolean | null, restrictedFields?: any | null }> | null, fieldPermissions?: Array<{ __typename?: 'FieldPermission', objectMetadataId: string, fieldMetadataId: string, canReadFieldValue?: boolean | null, canUpdateFieldValue?: boolean | null, id: string, roleId: string }> | null }> };
+export type GetRolesQuery = { __typename?: 'Query', getRoles: Array<{ __typename?: 'Role', id: string, label: string, description?: string | null, icon?: string | null, canUpdateAllSettings: boolean, canAccessAllTools: boolean, isEditable: boolean, canReadAllObjectRecords: boolean, canUpdateAllObjectRecords: boolean, canSoftDeleteAllObjectRecords: boolean, canDestroyAllObjectRecords: boolean, canBeAssignedToUsers: boolean, canBeAssignedToAgents: boolean, canBeAssignedToApiKeys: boolean, workspaceMembers: Array<{ __typename?: 'WorkspaceMember', id: string, avatarUrl?: string | null, userEmail: string, name: { __typename?: 'FullName', firstName: string, lastName: string } }>, agents: Array<{ __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 }>, apiKeys: Array<{ __typename?: 'ApiKeyForRole', id: string, name: string, expiresAt: string, revokedAt?: string | null }>, permissionFlags?: Array<{ __typename?: 'PermissionFlag', id: string, flag: PermissionFlagType, roleId: string }> | null, objectPermissions?: Array<{ __typename?: 'ObjectPermission', objectMetadataId: string, canReadObjectRecords?: boolean | null, canUpdateObjectRecords?: boolean | null, canSoftDeleteObjectRecords?: boolean | null, canDestroyObjectRecords?: boolean | null, restrictedFields?: any | null }> | null, fieldPermissions?: Array<{ __typename?: 'FieldPermission', objectMetadataId: string, fieldMetadataId: string, canReadFieldValue?: boolean | null, canUpdateFieldValue?: boolean | null, id: string, roleId: string }> | null }> };
 
 export type CreateApprovedAccessDomainMutationVariables = Exact<{
   input: CreateApprovedAccessDomainInput;
@@ -6435,6 +6501,7 @@ export const AgentFieldsFragmentDoc = gql`
   roleId
   isCustom
   modelConfiguration
+  evaluationInputs
   applicationId
   createdAt
   updatedAt
@@ -7211,6 +7278,43 @@ export function useDeleteOneAgentMutation(baseOptions?: Apollo.MutationHookOptio
 export type DeleteOneAgentMutationHookResult = ReturnType<typeof useDeleteOneAgentMutation>;
 export type DeleteOneAgentMutationResult = Apollo.MutationResult<DeleteOneAgentMutation>;
 export type DeleteOneAgentMutationOptions = Apollo.BaseMutationOptions<DeleteOneAgentMutation, DeleteOneAgentMutationVariables>;
+export const EvaluateAgentTurnDocument = gql`
+    mutation EvaluateAgentTurn($turnId: UUID!) {
+  evaluateAgentTurn(turnId: $turnId) {
+    id
+    turnId
+    score
+    comment
+    createdAt
+  }
+}
+    `;
+export type EvaluateAgentTurnMutationFn = Apollo.MutationFunction<EvaluateAgentTurnMutation, EvaluateAgentTurnMutationVariables>;
+
+/**
+ * __useEvaluateAgentTurnMutation__
+ *
+ * To run a mutation, you first call `useEvaluateAgentTurnMutation` within a React component and pass it any options that fit your needs.
+ * When your component renders, `useEvaluateAgentTurnMutation` returns a tuple that includes:
+ * - A mutate function that you can call at any time to execute the mutation
+ * - An object with fields that represent the current status of the mutation's execution
+ *
+ * @param baseOptions options that will be passed into the mutation, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options-2;
+ *
+ * @example
+ * const [evaluateAgentTurnMutation, { data, loading, error }] = useEvaluateAgentTurnMutation({
+ *   variables: {
+ *      turnId: // value for 'turnId'
+ *   },
+ * });
+ */
+export function useEvaluateAgentTurnMutation(baseOptions?: Apollo.MutationHookOptions<EvaluateAgentTurnMutation, EvaluateAgentTurnMutationVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useMutation<EvaluateAgentTurnMutation, EvaluateAgentTurnMutationVariables>(EvaluateAgentTurnDocument, options);
+      }
+export type EvaluateAgentTurnMutationHookResult = ReturnType<typeof useEvaluateAgentTurnMutation>;
+export type EvaluateAgentTurnMutationResult = Apollo.MutationResult<EvaluateAgentTurnMutation>;
+export type EvaluateAgentTurnMutationOptions = Apollo.BaseMutationOptions<EvaluateAgentTurnMutation, EvaluateAgentTurnMutationVariables>;
 export const RemoveRoleFromAgentDocument = gql`
     mutation RemoveRoleFromAgent($agentId: UUID!) {
   removeRoleFromAgent(agentId: $agentId)
@@ -7242,6 +7346,49 @@ export function useRemoveRoleFromAgentMutation(baseOptions?: Apollo.MutationHook
 export type RemoveRoleFromAgentMutationHookResult = ReturnType<typeof useRemoveRoleFromAgentMutation>;
 export type RemoveRoleFromAgentMutationResult = Apollo.MutationResult<RemoveRoleFromAgentMutation>;
 export type RemoveRoleFromAgentMutationOptions = Apollo.BaseMutationOptions<RemoveRoleFromAgentMutation, RemoveRoleFromAgentMutationVariables>;
+export const RunEvaluationInputDocument = gql`
+    mutation RunEvaluationInput($agentId: UUID!, $input: String!) {
+  runEvaluationInput(agentId: $agentId, input: $input) {
+    id
+    threadId
+    agentId
+    createdAt
+    evaluations {
+      id
+      score
+      comment
+      createdAt
+    }
+  }
+}
+    `;
+export type RunEvaluationInputMutationFn = Apollo.MutationFunction<RunEvaluationInputMutation, RunEvaluationInputMutationVariables>;
+
+/**
+ * __useRunEvaluationInputMutation__
+ *
+ * To run a mutation, you first call `useRunEvaluationInputMutation` within a React component and pass it any options that fit your needs.
+ * When your component renders, `useRunEvaluationInputMutation` returns a tuple that includes:
+ * - A mutate function that you can call at any time to execute the mutation
+ * - An object with fields that represent the current status of the mutation's execution
+ *
+ * @param baseOptions options that will be passed into the mutation, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options-2;
+ *
+ * @example
+ * const [runEvaluationInputMutation, { data, loading, error }] = useRunEvaluationInputMutation({
+ *   variables: {
+ *      agentId: // value for 'agentId'
+ *      input: // value for 'input'
+ *   },
+ * });
+ */
+export function useRunEvaluationInputMutation(baseOptions?: Apollo.MutationHookOptions<RunEvaluationInputMutation, RunEvaluationInputMutationVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useMutation<RunEvaluationInputMutation, RunEvaluationInputMutationVariables>(RunEvaluationInputDocument, options);
+      }
+export type RunEvaluationInputMutationHookResult = ReturnType<typeof useRunEvaluationInputMutation>;
+export type RunEvaluationInputMutationResult = Apollo.MutationResult<RunEvaluationInputMutation>;
+export type RunEvaluationInputMutationOptions = Apollo.BaseMutationOptions<RunEvaluationInputMutation, RunEvaluationInputMutationVariables>;
 export const UpdateOneAgentDocument = gql`
     mutation UpdateOneAgent($input: UpdateAgentInput!) {
   updateOneAgent(input: $input) {
@@ -7344,11 +7491,85 @@ export function useFindOneAgentLazyQuery(baseOptions?: Apollo.LazyQueryHookOptio
 export type FindOneAgentQueryHookResult = ReturnType<typeof useFindOneAgentQuery>;
 export type FindOneAgentLazyQueryHookResult = ReturnType<typeof useFindOneAgentLazyQuery>;
 export type FindOneAgentQueryResult = Apollo.QueryResult<FindOneAgentQuery, FindOneAgentQueryVariables>;
+export const GetAgentTurnsDocument = gql`
+    query GetAgentTurns($agentId: UUID!) {
+  agentTurns(agentId: $agentId) {
+    id
+    threadId
+    agentId
+    createdAt
+    evaluations {
+      id
+      score
+      comment
+      createdAt
+    }
+    messages {
+      id
+      role
+      createdAt
+      parts {
+        id
+        type
+        textContent
+        reasoningContent
+        toolName
+        toolCallId
+        toolInput
+        toolOutput
+        errorMessage
+        state
+        errorDetails
+        sourceUrlSourceId
+        sourceUrlUrl
+        sourceUrlTitle
+        sourceDocumentSourceId
+        sourceDocumentMediaType
+        sourceDocumentTitle
+        sourceDocumentFilename
+        fileMediaType
+        fileFilename
+        fileUrl
+        providerMetadata
+      }
+    }
+  }
+}
+    `;
+
+/**
+ * __useGetAgentTurnsQuery__
+ *
+ * To run a query within a React component, call `useGetAgentTurnsQuery` and pass it any options that fit your needs.
+ * When your component renders, `useGetAgentTurnsQuery` returns an object from Apollo Client that contains loading, error, and data properties
+ * you can use to render your UI.
+ *
+ * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
+ *
+ * @example
+ * const { data, loading, error } = useGetAgentTurnsQuery({
+ *   variables: {
+ *      agentId: // value for 'agentId'
+ *   },
+ * });
+ */
+export function useGetAgentTurnsQuery(baseOptions: Apollo.QueryHookOptions<GetAgentTurnsQuery, GetAgentTurnsQueryVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useQuery<GetAgentTurnsQuery, GetAgentTurnsQueryVariables>(GetAgentTurnsDocument, options);
+      }
+export function useGetAgentTurnsLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<GetAgentTurnsQuery, GetAgentTurnsQueryVariables>) {
+          const options = {...defaultOptions, ...baseOptions}
+          return Apollo.useLazyQuery<GetAgentTurnsQuery, GetAgentTurnsQueryVariables>(GetAgentTurnsDocument, options);
+        }
+export type GetAgentTurnsQueryHookResult = ReturnType<typeof useGetAgentTurnsQuery>;
+export type GetAgentTurnsLazyQueryHookResult = ReturnType<typeof useGetAgentTurnsLazyQuery>;
+export type GetAgentTurnsQueryResult = Apollo.QueryResult<GetAgentTurnsQuery, GetAgentTurnsQueryVariables>;
 export const GetChatMessagesDocument = gql`
     query GetChatMessages($threadId: UUID!) {
   chatMessages(threadId: $threadId) {
     id
     threadId
+    turnId
     role
     createdAt
     parts {
diff --git a/packages/twenty-front/src/generated/graphql.ts b/packages/twenty-front/src/generated/graphql.ts
index f89b6051ef9..042bcee9f5a 100644
--- a/packages/twenty-front/src/generated/graphql.ts
+++ b/packages/twenty-front/src/generated/graphql.ts
@@ -53,6 +53,7 @@ export type Agent = {
   applicationId?: Maybe<Scalars['UUID']>;
   createdAt: Scalars['DateTime'];
   description?: Maybe<Scalars['String']>;
+  evaluationInputs: Array<Scalars['String']>;
   icon?: Maybe<Scalars['String']>;
   id: Scalars['UUID'];
   isCustom: Scalars['Boolean'];
@@ -67,17 +68,32 @@ export type Agent = {
   updatedAt: Scalars['DateTime'];
 };
 
-export type AgentChatMessage = {
-  __typename?: 'AgentChatMessage';
+export type AgentChatThread = {
+  __typename?: 'AgentChatThread';
   createdAt: Scalars['DateTime'];
   id: Scalars['UUID'];
-  parts: Array<AgentChatMessagePart>;
-  role: Scalars['String'];
-  threadId: Scalars['UUID'];
+  title?: Maybe<Scalars['String']>;
+  updatedAt: Scalars['DateTime'];
 };
 
-export type AgentChatMessagePart = {
-  __typename?: 'AgentChatMessagePart';
+export type AgentIdInput = {
+  /** The id of the agent. */
+  id: Scalars['UUID'];
+};
+
+export type AgentMessage = {
+  __typename?: 'AgentMessage';
+  agentId?: Maybe<Scalars['UUID']>;
+  createdAt: Scalars['DateTime'];
+  id: Scalars['UUID'];
+  parts: Array<AgentMessagePart>;
+  role: Scalars['String'];
+  threadId: Scalars['UUID'];
+  turnId: Scalars['UUID'];
+};
+
+export type AgentMessagePart = {
+  __typename?: 'AgentMessagePart';
   createdAt: Scalars['DateTime'];
   errorDetails?: Maybe<Scalars['JSON']>;
   errorMessage?: Maybe<Scalars['String']>;
@@ -105,17 +121,23 @@ export type AgentChatMessagePart = {
   type: Scalars['String'];
 };
 
-export type AgentChatThread = {
-  __typename?: 'AgentChatThread';
+export type AgentTurn = {
+  __typename?: 'AgentTurn';
+  agentId?: Maybe<Scalars['UUID']>;
   createdAt: Scalars['DateTime'];
+  evaluations: Array<AgentTurnEvaluation>;
   id: Scalars['UUID'];
-  title?: Maybe<Scalars['String']>;
-  updatedAt: Scalars['DateTime'];
+  messages: Array<AgentMessage>;
+  threadId: Scalars['UUID'];
 };
 
-export type AgentIdInput = {
-  /** The id of the agent. */
+export type AgentTurnEvaluation = {
+  __typename?: 'AgentTurnEvaluation';
+  comment?: Maybe<Scalars['String']>;
+  createdAt: Scalars['DateTime'];
   id: Scalars['UUID'];
+  score: Scalars['Int'];
+  turnId: Scalars['UUID'];
 };
 
 export type AggregateChartConfiguration = {
@@ -751,6 +773,7 @@ export type CoreViewSort = {
 
 export type CreateAgentInput = {
   description?: InputMaybe<Scalars['String']>;
+  evaluationInputs?: InputMaybe<Array<Scalars['String']>>;
   icon?: InputMaybe<Scalars['String']>;
   label: Scalars['String'];
   modelConfiguration?: InputMaybe<Scalars['JSON']>;
@@ -3018,6 +3041,7 @@ export enum PermissionFlagType {
   DATA_MODEL = 'DATA_MODEL',
   DOWNLOAD_FILE = 'DOWNLOAD_FILE',
   EXPORT_CSV = 'EXPORT_CSV',
+  HTTP_REQUEST_TOOL = 'HTTP_REQUEST_TOOL',
   IMPERSONATE = 'IMPERSONATE',
   IMPORT_CSV = 'IMPORT_CSV',
   LAYOUTS = 'LAYOUTS',
@@ -3980,6 +4004,7 @@ export type UuidFilterComparison = {
 
 export type UpdateAgentInput = {
   description?: InputMaybe<Scalars['String']>;
+  evaluationInputs?: InputMaybe<Array<Scalars['String']>>;
   icon?: InputMaybe<Scalars['String']>;
   id: Scalars['UUID'];
   label?: InputMaybe<Scalars['String']>;
diff --git a/packages/twenty-front/src/modules/ai/components/AIChatMessage.tsx b/packages/twenty-front/src/modules/ai/components/AIChatMessage.tsx
index 477874736d2..f813afde045 100644
--- a/packages/twenty-front/src/modules/ai/components/AIChatMessage.tsx
+++ b/packages/twenty-front/src/modules/ai/components/AIChatMessage.tsx
@@ -4,7 +4,7 @@ import { useRecoilValue } from 'recoil';
 import { Avatar, IconSparkles } from 'twenty-ui/display';
 
 import { AgentChatFilePreview } from '@/ai/components/internal/AgentChatFilePreview';
-import { AgentChatMessageRole } from '@/ai/constants/AgentChatMessageRole';
+import { AgentMessageRole } from '@/ai/constants/AgentMessageRole';
 
 import { AIChatAssistantMessageRenderer } from '@/ai/components/AIChatAssistantMessageRenderer';
 import { AIChatErrorMessage } from '@/ai/components/AIChatErrorMessage';
@@ -161,17 +161,17 @@ export const AIChatMessage = ({
   );
 
   const showError =
-    isDefined(error) && message.role === AgentChatMessageRole.ASSISTANT;
+    isDefined(error) && message.role === AgentMessageRole.ASSISTANT;
 
   const fileParts = message.parts.filter((part) => part.type === 'file');
 
   return (
     <StyledMessageBubble
       key={message.id}
-      isUser={message.role === AgentChatMessageRole.USER}
+      isUser={message.role === AgentMessageRole.USER}
     >
       <StyledMessageRow>
-        {message.role === AgentChatMessageRole.ASSISTANT && (
+        {message.role === AgentMessageRole.ASSISTANT && (
           <StyledAvatarContainer>
             <Avatar
               size="sm"
@@ -181,15 +181,13 @@ export const AIChatMessage = ({
             />
           </StyledAvatarContainer>
         )}
-        {message.role === AgentChatMessageRole.USER && (
+        {message.role === AgentMessageRole.USER && (
           <StyledAvatarContainer isUser>
             <Avatar size="sm" placeholder="U" type="rounded" />
           </StyledAvatarContainer>
         )}
         <StyledMessageContainer>
-          <StyledMessageText
-            isUser={message.role === AgentChatMessageRole.USER}
-          >
+          <StyledMessageText isUser={message.role === AgentMessageRole.USER}>
             <AIChatAssistantMessageRenderer
               isLastMessageStreaming={isLastMessageStreaming}
               messageParts={message.parts}
diff --git a/packages/twenty-front/src/modules/ai/constants/AgentChatMessageRole.ts b/packages/twenty-front/src/modules/ai/constants/AgentChatMessageRole.ts
deleted file mode 100644
index f8d7a24c2be..00000000000
--- a/packages/twenty-front/src/modules/ai/constants/AgentChatMessageRole.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export enum AgentChatMessageRole {
-  USER = 'user',
-  ASSISTANT = 'assistant',
-}
diff --git a/packages/twenty-front/src/modules/ai/constants/AgentMessageRole.ts b/packages/twenty-front/src/modules/ai/constants/AgentMessageRole.ts
new file mode 100644
index 00000000000..39c4a7cb53c
--- /dev/null
+++ b/packages/twenty-front/src/modules/ai/constants/AgentMessageRole.ts
@@ -0,0 +1,5 @@
+export enum AgentMessageRole {
+  SYSTEM = 'system',
+  USER = 'user',
+  ASSISTANT = 'assistant',
+}
diff --git a/packages/twenty-front/src/modules/ai/graphql/fragments/agentFragment.ts b/packages/twenty-front/src/modules/ai/graphql/fragments/agentFragment.ts
index a01092f553d..3e324ab8fa6 100644
--- a/packages/twenty-front/src/modules/ai/graphql/fragments/agentFragment.ts
+++ b/packages/twenty-front/src/modules/ai/graphql/fragments/agentFragment.ts
@@ -13,6 +13,7 @@ export const AGENT_FRAGMENT = gql`
     roleId
     isCustom
     modelConfiguration
+    evaluationInputs
     applicationId
     createdAt
     updatedAt
diff --git a/packages/twenty-front/src/modules/ai/graphql/mutations/evaluateAgentTurn.ts b/packages/twenty-front/src/modules/ai/graphql/mutations/evaluateAgentTurn.ts
new file mode 100644
index 00000000000..6b681cc78de
--- /dev/null
+++ b/packages/twenty-front/src/modules/ai/graphql/mutations/evaluateAgentTurn.ts
@@ -0,0 +1,13 @@
+import { gql } from '@apollo/client';
+
+export const EVALUATE_AGENT_TURN = gql`
+  mutation EvaluateAgentTurn($turnId: UUID!) {
+    evaluateAgentTurn(turnId: $turnId) {
+      id
+      turnId
+      score
+      comment
+      createdAt
+    }
+  }
+`;
diff --git a/packages/twenty-front/src/modules/ai/graphql/mutations/runEvaluationInput.ts b/packages/twenty-front/src/modules/ai/graphql/mutations/runEvaluationInput.ts
new file mode 100644
index 00000000000..cba1bae4a28
--- /dev/null
+++ b/packages/twenty-front/src/modules/ai/graphql/mutations/runEvaluationInput.ts
@@ -0,0 +1,18 @@
+import { gql } from '@apollo/client';
+
+export const RUN_EVALUATION_INPUT = gql`
+  mutation RunEvaluationInput($agentId: UUID!, $input: String!) {
+    runEvaluationInput(agentId: $agentId, input: $input) {
+      id
+      threadId
+      agentId
+      createdAt
+      evaluations {
+        id
+        score
+        comment
+        createdAt
+      }
+    }
+  }
+`;
diff --git a/packages/twenty-front/src/modules/ai/graphql/queries/getAgentTurns.ts b/packages/twenty-front/src/modules/ai/graphql/queries/getAgentTurns.ts
new file mode 100644
index 00000000000..39a63df8eef
--- /dev/null
+++ b/packages/twenty-front/src/modules/ai/graphql/queries/getAgentTurns.ts
@@ -0,0 +1,47 @@
+import { gql } from '@apollo/client';
+
+export const GET_AGENT_TURNS = gql`
+  query GetAgentTurns($agentId: UUID!) {
+    agentTurns(agentId: $agentId) {
+      id
+      threadId
+      agentId
+      createdAt
+      evaluations {
+        id
+        score
+        comment
+        createdAt
+      }
+      messages {
+        id
+        role
+        createdAt
+        parts {
+          id
+          type
+          textContent
+          reasoningContent
+          toolName
+          toolCallId
+          toolInput
+          toolOutput
+          errorMessage
+          state
+          errorDetails
+          sourceUrlSourceId
+          sourceUrlUrl
+          sourceUrlTitle
+          sourceDocumentSourceId
+          sourceDocumentMediaType
+          sourceDocumentTitle
+          sourceDocumentFilename
+          fileMediaType
+          fileFilename
+          fileUrl
+          providerMetadata
+        }
+      }
+    }
+  }
+`;
diff --git a/packages/twenty-front/src/modules/ai/graphql/queries/getChatMessages.ts b/packages/twenty-front/src/modules/ai/graphql/queries/getChatMessages.ts
index 11bc878af4e..0dff27ff1bd 100644
--- a/packages/twenty-front/src/modules/ai/graphql/queries/getChatMessages.ts
+++ b/packages/twenty-front/src/modules/ai/graphql/queries/getChatMessages.ts
@@ -5,6 +5,7 @@ export const GET_CHAT_MESSAGES = gql`
     chatMessages(threadId: $threadId) {
       id
       threadId
+      turnId
       role
       createdAt
       parts {
diff --git a/packages/twenty-front/src/modules/ai/states/agentChatMessagesComponentState.ts b/packages/twenty-front/src/modules/ai/states/agentChatMessagesComponentState.ts
index b630408a928..a0111cca9df 100644
--- a/packages/twenty-front/src/modules/ai/states/agentChatMessagesComponentState.ts
+++ b/packages/twenty-front/src/modules/ai/states/agentChatMessagesComponentState.ts
@@ -1,12 +1,12 @@
 import { createComponentInstanceContext } from '@/ui/utilities/state/component-state/utils/createComponentInstanceContext';
 import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
-import { type AgentChatMessage } from '~/generated-metadata/graphql';
+import { type AgentMessage } from '~/generated-metadata/graphql';
 
 export const AgentChatMessagesComponentInstanceContext =
   createComponentInstanceContext();
 
 export const agentChatMessagesComponentState = createComponentState<
-  AgentChatMessage[]
+  AgentMessage[]
 >({
   key: 'agentChatMessagesComponentState',
   defaultValue: [],
diff --git a/packages/twenty-front/src/modules/ai/utils/mapDBMessagesToUIMessages.ts b/packages/twenty-front/src/modules/ai/utils/mapDBMessagesToUIMessages.ts
index 368bdf53213..aaf65b4eb0a 100644
--- a/packages/twenty-front/src/modules/ai/utils/mapDBMessagesToUIMessages.ts
+++ b/packages/twenty-front/src/modules/ai/utils/mapDBMessagesToUIMessages.ts
@@ -1,9 +1,9 @@
 import { mapDBPartToUIMessagePart } from '@/ai/utils/mapDBPartToUIMessagePart';
 import { type ExtendedUIMessage } from 'twenty-shared/ai';
-import { type AgentChatMessage } from '~/generated/graphql';
+import { type AgentMessage } from '~/generated/graphql';
 
 export const mapDBMessagesToUIMessages = (
-  dbMessages: AgentChatMessage[],
+  dbMessages: AgentMessage[],
 ): ExtendedUIMessage[] => {
   return dbMessages.map((dbMessage) => ({
     id: dbMessage.id,
diff --git a/packages/twenty-front/src/modules/ai/utils/mapDBPartToUIMessagePart.ts b/packages/twenty-front/src/modules/ai/utils/mapDBPartToUIMessagePart.ts
index f3414bebd02..5bb6d60a0a0 100644
--- a/packages/twenty-front/src/modules/ai/utils/mapDBPartToUIMessagePart.ts
+++ b/packages/twenty-front/src/modules/ai/utils/mapDBPartToUIMessagePart.ts
@@ -1,9 +1,9 @@
 import { type ReasoningUIPart, type ToolUIPart } from 'ai';
 import { type ExtendedUIMessagePart } from 'twenty-shared/ai';
-import { type AgentChatMessagePart } from '~/generated/graphql';
+import { type AgentMessagePart } from '~/generated/graphql';
 
 export const mapDBPartToUIMessagePart = (
-  part: AgentChatMessagePart,
+  part: AgentMessagePart,
 ): ExtendedUIMessagePart => {
   switch (part.type) {
     case 'text':
diff --git a/packages/twenty-front/src/modules/app/components/SettingsRoutes.tsx b/packages/twenty-front/src/modules/app/components/SettingsRoutes.tsx
index d4bfe5b3624..f6cdef944c7 100644
--- a/packages/twenty-front/src/modules/app/components/SettingsRoutes.tsx
+++ b/packages/twenty-front/src/modules/app/components/SettingsRoutes.tsx
@@ -165,6 +165,12 @@ const SettingsAgentForm = lazy(() =>
   })),
 );
 
+const SettingsAgentTurnDetail = lazy(() =>
+  import('~/pages/settings/ai/SettingsAgentTurnDetail').then((module) => ({
+    default: module.SettingsAgentTurnDetail,
+  })),
+);
+
 const SettingsWorkspaceMembers = lazy(() =>
   import('~/pages/settings/SettingsWorkspaceMembers').then((module) => ({
     default: module.SettingsWorkspaceMembers,
@@ -422,6 +428,10 @@ export const SettingsRoutes = ({ isAdminPageEnabled }: SettingsRoutesProps) => (
           path={SettingsPath.AIAgentDetail}
           element={<SettingsAgentForm mode="edit" />}
         />
+        <Route
+          path={SettingsPath.AIAgentTurnDetail}
+          element={<SettingsAgentTurnDetail />}
+        />
         <Route path={SettingsPath.Billing} element={<SettingsBilling />} />
         <Route path={SettingsPath.Domain} element={<SettingsDomain />} />
         <Route
diff --git a/packages/twenty-front/src/modules/settings/components/SettingsListItemCardContent.tsx b/packages/twenty-front/src/modules/settings/components/SettingsListItemCardContent.tsx
index 2c6cb37f3b1..ac2433e936c 100644
--- a/packages/twenty-front/src/modules/settings/components/SettingsListItemCardContent.tsx
+++ b/packages/twenty-front/src/modules/settings/components/SettingsListItemCardContent.tsx
@@ -33,9 +33,17 @@ const StyledRightContainer = styled.div`
 `;
 
 const StyledContent = styled.div`
-  flex: 1 0 auto;
+  flex: 1 1 0;
   display: flex;
   gap: ${({ theme }) => theme.spacing(1)};
+  min-width: 0;
+  overflow: hidden;
+`;
+
+const StyledLabel = styled.span`
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 `;
 
 const StyledDescription = styled.span`
@@ -81,7 +89,7 @@ export const SettingsListItemCardContent = ({
         />
       )}
       <StyledContent>
-        {label}
+        <StyledLabel>{label}</StyledLabel>
         {!!description && <StyledDescription>{description}</StyledDescription>}
       </StyledContent>
       <StyledRightContainer>
diff --git a/packages/twenty-front/src/modules/settings/roles/role-permissions/permission-flags/components/SettingsRolePermissionsSettingsSection.tsx b/packages/twenty-front/src/modules/settings/roles/role-permissions/permission-flags/components/SettingsRolePermissionsSettingsSection.tsx
index 966451480f6..94a53549e66 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-permissions/permission-flags/components/SettingsRolePermissionsSettingsSection.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/role-permissions/permission-flags/components/SettingsRolePermissionsSettingsSection.tsx
@@ -68,78 +68,117 @@ export const SettingsRolePermissionsSettingsSection = ({
         name: t`API Keys & Webhooks`,
         description: t`Manage API keys and webhooks`,
         Icon: IconCode,
+        isRelevantForAgents: true,
+        isRelevantForApiKeys: true,
+        isRelevantForUsers: true,
       },
       {
         key: PermissionFlagType.WORKSPACE,
         name: t`Workspace`,
         description: t`Set global workspace preferences`,
         Icon: IconSettings,
+        isRelevantForAgents: true,
+        isRelevantForApiKeys: true,
+        isRelevantForUsers: true,
       },
       {
         key: PermissionFlagType.WORKSPACE_MEMBERS,
         name: t`Users`,
         description: t`Add or remove users`,
         Icon: IconUsers,
+        isRelevantForAgents: true,
+        isRelevantForApiKeys: true,
+        isRelevantForUsers: true,
       },
       {
         key: PermissionFlagType.ROLES,
         name: t`Roles`,
         description: t`Define user roles and access levels`,
         Icon: IconLockOpen,
+        isRelevantForAgents: true,
+        isRelevantForApiKeys: true,
+        isRelevantForUsers: true,
       },
       {
         key: PermissionFlagType.DATA_MODEL,
         name: t`Data Model`,
         description: t`Edit data structure and fields`,
         Icon: IconHierarchy,
+        isRelevantForAgents: true,
+        isRelevantForApiKeys: true,
+        isRelevantForUsers: true,
       },
       {
         key: PermissionFlagType.SECURITY,
         name: t`Security`,
         description: t`Manage security policies`,
         Icon: IconKey,
+        isRelevantForAgents: true,
+        isRelevantForApiKeys: true,
+        isRelevantForUsers: true,
       },
       {
         key: PermissionFlagType.WORKFLOWS,
         name: t`Workflows`,
         description: t`Manage workflows`,
         Icon: IconSettingsAutomation,
+        isRelevantForAgents: true,
+        isRelevantForApiKeys: true,
+        isRelevantForUsers: true,
       },
       {
         key: PermissionFlagType.SSO_BYPASS,
         name: t`SSO Bypass`,
         description: t`Enable bypass options`,
         Icon: IconShield,
+        isRelevantForAgents: false,
+        isRelevantForApiKeys: false,
+        isRelevantForUsers: true,
       },
       {
         key: PermissionFlagType.IMPERSONATE,
         name: t`Impersonate`,
         description: t`Impersonate workspace users`,
         Icon: IconSpy,
+        isRelevantForAgents: false,
+        isRelevantForApiKeys: false,
+        isRelevantForUsers: true,
       },
       {
         key: PermissionFlagType.APPLICATIONS,
         name: t`Applications`,
         description: t`Install and manage applications`,
         Icon: IconApps,
+        isRelevantForAgents: true,
+        isRelevantForApiKeys: true,
+        isRelevantForUsers: true,
       },
       {
         key: PermissionFlagType.LAYOUTS,
         name: t`Layouts`,
         description: t`Customize page layouts and UI structure`,
         Icon: IconLayoutSidebarRightCollapse,
+        isRelevantForAgents: true,
+        isRelevantForApiKeys: true,
+        isRelevantForUsers: true,
       },
       {
         key: PermissionFlagType.BILLING,
         name: t`Billing`,
         description: t`Manage billing and subscriptions`,
         Icon: IconCreditCard,
+        isRelevantForAgents: false,
+        isRelevantForApiKeys: false,
+        isRelevantForUsers: true,
       },
       {
         key: PermissionFlagType.AI_SETTINGS,
         name: t`AI`,
         description: t`Create and configure AI agents`,
         Icon: IconSparkles,
+        isRelevantForAgents: true,
+        isRelevantForApiKeys: true,
+        isRelevantForUsers: true,
       },
     ];
 
@@ -153,30 +192,67 @@ export const SettingsRolePermissionsSettingsSection = ({
       ) {
         return false;
       }
+
+      // Filter based on role assignment capabilities
+      const canBeAssignedOnlyToAgents =
+        settingsDraftRole.canBeAssignedToAgents &&
+        !settingsDraftRole.canBeAssignedToUsers &&
+        !settingsDraftRole.canBeAssignedToApiKeys;
+
+      const canBeAssignedOnlyToApiKeys =
+        settingsDraftRole.canBeAssignedToApiKeys &&
+        !settingsDraftRole.canBeAssignedToUsers &&
+        !settingsDraftRole.canBeAssignedToAgents;
+
+      const canBeAssignedOnlyToUsers =
+        settingsDraftRole.canBeAssignedToUsers &&
+        !settingsDraftRole.canBeAssignedToAgents &&
+        !settingsDraftRole.canBeAssignedToApiKeys;
+
+      if (canBeAssignedOnlyToAgents && !permission.isRelevantForAgents) {
+        return false;
+      }
+
+      if (canBeAssignedOnlyToApiKeys && !permission.isRelevantForApiKeys) {
+        return false;
+      }
+
+      if (canBeAssignedOnlyToUsers && !permission.isRelevantForUsers) {
+        return false;
+      }
+
       return true;
     });
-  }, [isAIEnabled, isApplicationEnabled]);
+  }, [isAIEnabled, isApplicationEnabled, settingsDraftRole]);
+
+  const shouldShowAllAccessToggle =
+    !settingsDraftRole.canBeAssignedToAgents ||
+    settingsDraftRole.canBeAssignedToUsers;
 
   return (
     <Section>
       <H2Title title={t`Settings`} description={t`Settings permissions`} />
-      <StyledCard rounded>
-        <SettingsOptionCardContentToggle
-          Icon={IconSettings}
-          title={t`Settings All Access`}
-          description={t`Ability to edit all settings`}
-          checked={settingsDraftRole.canUpdateAllSettings}
-          disabled={!isEditable}
-          onChange={() => {
-            setSettingsDraftRole({
-              ...settingsDraftRole,
-              canUpdateAllSettings: !settingsDraftRole.canUpdateAllSettings,
-            });
-          }}
-        />
-      </StyledCard>
+      {shouldShowAllAccessToggle && (
+        <StyledCard rounded>
+          <SettingsOptionCardContentToggle
+            Icon={IconSettings}
+            title={t`Settings All Access`}
+            description={t`Ability to edit all settings`}
+            checked={settingsDraftRole.canUpdateAllSettings}
+            disabled={!isEditable}
+            onChange={() => {
+              setSettingsDraftRole({
+                ...settingsDraftRole,
+                canUpdateAllSettings: !settingsDraftRole.canUpdateAllSettings,
+              });
+            }}
+          />
+        </StyledCard>
+      )}
       <AnimatedExpandableContainer
-        isExpanded={!settingsDraftRole.canUpdateAllSettings}
+        isExpanded={
+          !shouldShowAllAccessToggle || !settingsDraftRole.canUpdateAllSettings
+        }
         dimension="height"
         animationDurations={{
           opacity: 0.2,
diff --git a/packages/twenty-front/src/modules/settings/roles/role-permissions/permission-flags/components/SettingsRolePermissionsToolSection.tsx b/packages/twenty-front/src/modules/settings/roles/role-permissions/permission-flags/components/SettingsRolePermissionsToolSection.tsx
index b96b2c748e4..b84b103c53f 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-permissions/permission-flags/components/SettingsRolePermissionsToolSection.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/role-permissions/permission-flags/components/SettingsRolePermissionsToolSection.tsx
@@ -10,6 +10,7 @@ import { useRecoilState } from 'recoil';
 
 import {
   H2Title,
+  IconApi,
   IconAt,
   IconDownload,
   IconFileExport,
@@ -62,6 +63,9 @@ export const SettingsRolePermissionsToolSection = ({
       description: t`Chat with AI agents and use AI features`,
       Icon: IconSparkles,
       isToolPermission: true,
+      isRelevantForAgents: false,
+      isRelevantForApiKeys: true,
+      isRelevantForUsers: true,
     },
     {
       key: PermissionFlagType.UPLOAD_FILE,
@@ -69,6 +73,9 @@ export const SettingsRolePermissionsToolSection = ({
       description: t`Allow uploading files and attachments`,
       Icon: IconFileUpload,
       isToolPermission: true,
+      isRelevantForAgents: false,
+      isRelevantForApiKeys: true,
+      isRelevantForUsers: true,
     },
     {
       key: PermissionFlagType.DOWNLOAD_FILE,
@@ -76,6 +83,9 @@ export const SettingsRolePermissionsToolSection = ({
       description: t`Allow downloading files and attachments`,
       Icon: IconDownload,
       isToolPermission: true,
+      isRelevantForAgents: false,
+      isRelevantForApiKeys: true,
+      isRelevantForUsers: true,
     },
     {
       key: PermissionFlagType.SEND_EMAIL_TOOL,
@@ -83,6 +93,19 @@ export const SettingsRolePermissionsToolSection = ({
       description: t`Send emails via connected accounts`,
       Icon: IconMail,
       isToolPermission: true,
+      isRelevantForAgents: true,
+      isRelevantForApiKeys: true,
+      isRelevantForUsers: true,
+    },
+    {
+      key: PermissionFlagType.HTTP_REQUEST_TOOL,
+      name: t`HTTP Request`,
+      description: t`Make HTTP requests to external APIs`,
+      Icon: IconApi,
+      isToolPermission: true,
+      isRelevantForAgents: true,
+      isRelevantForApiKeys: false,
+      isRelevantForUsers: false,
     },
     {
       key: PermissionFlagType.IMPORT_CSV,
@@ -90,6 +113,9 @@ export const SettingsRolePermissionsToolSection = ({
       description: t`Allow importing data from CSV files`,
       Icon: IconFileImport,
       isToolPermission: true,
+      isRelevantForAgents: false,
+      isRelevantForApiKeys: true,
+      isRelevantForUsers: true,
     },
     {
       key: PermissionFlagType.EXPORT_CSV,
@@ -97,6 +123,9 @@ export const SettingsRolePermissionsToolSection = ({
       description: t`Allow exporting data to CSV files`,
       Icon: IconFileExport,
       isToolPermission: true,
+      isRelevantForAgents: false,
+      isRelevantForApiKeys: true,
+      isRelevantForUsers: true,
     },
     {
       key: PermissionFlagType.CONNECTED_ACCOUNTS,
@@ -104,6 +133,9 @@ export const SettingsRolePermissionsToolSection = ({
       description: t`Sync email and calendar accounts`,
       Icon: IconAt,
       isToolPermission: true,
+      isRelevantForAgents: false,
+      isRelevantForApiKeys: false,
+      isRelevantForUsers: true,
     },
     {
       key: PermissionFlagType.PROFILE_INFORMATION,
@@ -111,6 +143,9 @@ export const SettingsRolePermissionsToolSection = ({
       description: t`Edit own profile information`,
       Icon: IconUser,
       isToolPermission: true,
+      isRelevantForAgents: false,
+      isRelevantForApiKeys: false,
+      isRelevantForUsers: true,
     },
     {
       key: PermissionFlagType.VIEWS,
@@ -118,6 +153,9 @@ export const SettingsRolePermissionsToolSection = ({
       description: t`Create, edit, and delete workspace views`,
       Icon: IconTable,
       isToolPermission: true,
+      isRelevantForAgents: true,
+      isRelevantForApiKeys: true,
+      isRelevantForUsers: true,
     },
   ];
 
@@ -125,29 +163,65 @@ export const SettingsRolePermissionsToolSection = ({
     if (permission.key === PermissionFlagType.AI && !isAIEnabled) {
       return false;
     }
+
+    const canBeAssignedOnlyToAgents =
+      settingsDraftRole.canBeAssignedToAgents &&
+      !settingsDraftRole.canBeAssignedToUsers &&
+      !settingsDraftRole.canBeAssignedToApiKeys;
+
+    const canBeAssignedOnlyToApiKeys =
+      settingsDraftRole.canBeAssignedToApiKeys &&
+      !settingsDraftRole.canBeAssignedToUsers &&
+      !settingsDraftRole.canBeAssignedToAgents;
+
+    const canBeAssignedOnlyToUsers =
+      settingsDraftRole.canBeAssignedToUsers &&
+      !settingsDraftRole.canBeAssignedToAgents &&
+      !settingsDraftRole.canBeAssignedToApiKeys;
+
+    if (canBeAssignedOnlyToAgents && !permission.isRelevantForAgents) {
+      return false;
+    }
+
+    if (canBeAssignedOnlyToApiKeys && !permission.isRelevantForApiKeys) {
+      return false;
+    }
+
+    if (canBeAssignedOnlyToUsers && !permission.isRelevantForUsers) {
+      return false;
+    }
+
     return true;
   });
 
+  const shouldShowAllAccessToggle =
+    !settingsDraftRole.canBeAssignedToAgents ||
+    settingsDraftRole.canBeAssignedToUsers;
+
   return (
     <Section>
       <H2Title title={t`Actions`} description={t`Actions permissions`} />
-      <StyledCard rounded>
-        <SettingsOptionCardContentToggle
-          Icon={IconTool}
-          title={t`All Actions Access`}
-          description={t`Grants permission to perform all available actions without restriction`}
-          checked={settingsDraftRole.canAccessAllTools}
-          disabled={!isEditable}
-          onChange={() => {
-            setSettingsDraftRole({
-              ...settingsDraftRole,
-              canAccessAllTools: !settingsDraftRole.canAccessAllTools,
-            });
-          }}
-        />
-      </StyledCard>
+      {shouldShowAllAccessToggle && (
+        <StyledCard rounded>
+          <SettingsOptionCardContentToggle
+            Icon={IconTool}
+            title={t`All Actions Access`}
+            description={t`Grants permission to perform all available actions without restriction`}
+            checked={settingsDraftRole.canAccessAllTools}
+            disabled={!isEditable}
+            onChange={() => {
+              setSettingsDraftRole({
+                ...settingsDraftRole,
+                canAccessAllTools: !settingsDraftRole.canAccessAllTools,
+              });
+            }}
+          />
+        </StyledCard>
+      )}
       <AnimatedExpandableContainer
-        isExpanded={!settingsDraftRole.canAccessAllTools}
+        isExpanded={
+          !shouldShowAllAccessToggle || !settingsDraftRole.canAccessAllTools
+        }
         dimension="height"
         animationDurations={{
           opacity: 0.2,
diff --git a/packages/twenty-front/src/modules/settings/roles/role-permissions/permission-flags/types/SettingsRolePermissionsSettingPermission.ts b/packages/twenty-front/src/modules/settings/roles/role-permissions/permission-flags/types/SettingsRolePermissionsSettingPermission.ts
index 35cfe57fe35..2c878bade6c 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-permissions/permission-flags/types/SettingsRolePermissionsSettingPermission.ts
+++ b/packages/twenty-front/src/modules/settings/roles/role-permissions/permission-flags/types/SettingsRolePermissionsSettingPermission.ts
@@ -7,4 +7,7 @@ export type SettingsRolePermissionsSettingPermission = {
   description: string;
   Icon: IconComponent;
   isToolPermission?: boolean;
+  isRelevantForAgents?: boolean;
+  isRelevantForApiKeys?: boolean;
+  isRelevantForUsers?: boolean;
 };
diff --git a/packages/twenty-front/src/modules/settings/roles/role-settings/components/SettingsRoleApplicability.tsx b/packages/twenty-front/src/modules/settings/roles/role-settings/components/SettingsRoleApplicability.tsx
index f3b857544b0..ae5040de3b6 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-settings/components/SettingsRoleApplicability.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/role-settings/components/SettingsRoleApplicability.tsx
@@ -56,7 +56,7 @@ export const SettingsRoleApplicability = ({
   const options = [
     {
       key: 'canBeAssignedToUsers' as const,
-      label: t`Assignable to team members`,
+      label: t`Assignable to Workspace Members`,
       Icon: IconUsers,
     },
     {
diff --git a/packages/twenty-front/src/pages/settings/ai/SettingsAgentForm.tsx b/packages/twenty-front/src/pages/settings/ai/SettingsAgentForm.tsx
index dbab6a5444b..427ec0a1d2c 100644
--- a/packages/twenty-front/src/pages/settings/ai/SettingsAgentForm.tsx
+++ b/packages/twenty-front/src/pages/settings/ai/SettingsAgentForm.tsx
@@ -1,6 +1,7 @@
 import { ApolloError } from '@apollo/client';
 import styled from '@emotion/styled';
 import { useParams } from 'react-router-dom';
+import { useDebouncedCallback } from 'use-debounce';
 
 import { SaveAndCancelButtons } from '@/settings/components/SaveAndCancelButtons/SaveAndCancelButtons';
 import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
@@ -16,7 +17,12 @@ import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/ho
 import { t } from '@lingui/core/macro';
 import { AppPath, SettingsPath } from 'twenty-shared/types';
 import { getSettingsPath, isDefined } from 'twenty-shared/utils';
-import { IconLock, IconSettings } from 'twenty-ui/display';
+import {
+  IconList,
+  IconListCheck,
+  IconLock,
+  IconSettings,
+} from 'twenty-ui/display';
 import { Section } from 'twenty-ui/layout';
 import {
   type CreateAgentInput,
@@ -27,10 +33,12 @@ import {
 import { useNavigateApp } from '~/hooks/useNavigateApp';
 import { useNavigateSettings } from '~/hooks/useNavigateSettings';
 
-import { useState } from 'react';
+import { useEffect, useState } from 'react';
 import { useRecoilState, useRecoilValue } from 'recoil';
 import { isDeeplyEqual } from '~/utils/isDeeplyEqual';
 import { SettingsAgentDetailSkeletonLoader } from './components/SettingsAgentDetailSkeletonLoader';
+import { SettingsAgentEvalsTab } from './components/SettingsAgentEvalsTab';
+import { SettingsAgentLogsTab } from './components/SettingsAgentLogsTab';
 import { SettingsAgentRoleTab } from './components/SettingsAgentRoleTab';
 import { SettingsAgentSettingsTab } from './components/SettingsAgentSettingsTab';
 import { SETTINGS_AGENT_DETAIL_TABS } from './constants/SettingsAgentDetailTabs';
@@ -54,6 +62,9 @@ export const SettingsAgentForm = ({ mode }: { mode: 'create' | 'edit' }) => {
   const navigateApp = useNavigateApp();
   const { enqueueErrorSnackBar } = useSnackBar();
   const [isReadonlyMode, setIsReadonlyMode] = useState(false);
+  const [originalFormValues, setOriginalFormValues] = useState<
+    ReturnType<typeof useSettingsAgentFormState>['formValues'] | null
+  >(null);
 
   const isEditMode = mode === 'edit';
   const isCreateMode = mode === 'create';
@@ -82,7 +93,7 @@ export const SettingsAgentForm = ({ mode }: { mode: 'create' | 'edit' }) => {
         if (isDefined(agent.applicationId)) {
           setIsReadonlyMode(true);
         }
-        resetForm({
+        const initialValues = {
           name: agent.name,
           label: agent.label,
           description: agent.description,
@@ -93,7 +104,10 @@ export const SettingsAgentForm = ({ mode }: { mode: 'create' | 'edit' }) => {
           isCustom: agent.isCustom,
           modelConfiguration: agent.modelConfiguration || {},
           responseFormat: agent.responseFormat || { type: 'text', schema: {} },
-        });
+          evaluationInputs: agent.evaluationInputs || [],
+        };
+        resetForm(initialValues);
+        setOriginalFormValues(initialValues);
       } else {
         enqueueErrorSnackBar({
           message: t`Agent not found`,
@@ -130,6 +144,94 @@ export const SettingsAgentForm = ({ mode }: { mode: 'create' | 'edit' }) => {
     isDefined(formValues.role) &&
     !isDeeplyEqual(settingsDraftRole, settingsPersistedRole);
 
+  const autoSave = useDebouncedCallback(async () => {
+    if (
+      isCreateMode ||
+      isReadonlyMode ||
+      !validateForm() ||
+      isSubmitting ||
+      !agent
+    ) {
+      return;
+    }
+
+    const hasChanges =
+      originalFormValues && !isDeeplyEqual(formValues, originalFormValues);
+
+    if (!hasChanges && !isRoleDirty) {
+      return;
+    }
+
+    setIsSubmitting(true);
+
+    try {
+      if (isRoleDirty && isDefined(formValues.role)) {
+        try {
+          await saveDraftRoleToDB();
+        } catch (error) {
+          if (error instanceof ApolloError) {
+            enqueueErrorSnackBar({
+              apolloError: error,
+            });
+          } else {
+            const errorMessage =
+              error instanceof Error ? error.message : String(error);
+            enqueueErrorSnackBar({
+              message: t`Failed to save role permissions: ${errorMessage}`,
+            });
+          }
+          setIsSubmitting(false);
+          return;
+        }
+      }
+
+      await updateAgent({
+        variables: {
+          input: {
+            id: agent.id,
+            name: formValues.name || '',
+            label: formValues.label,
+            description: formValues.description,
+            icon: formValues.icon,
+            modelId: formValues.modelId,
+            roleId: formValues.role,
+            prompt: formValues.prompt,
+            modelConfiguration: formValues.modelConfiguration,
+            responseFormat: formValues.responseFormat,
+            evaluationInputs: formValues.evaluationInputs,
+          },
+        },
+      });
+
+      setOriginalFormValues({ ...formValues });
+    } catch (error) {
+      enqueueErrorSnackBar({
+        apolloError: error instanceof ApolloError ? error : undefined,
+      });
+    } finally {
+      setIsSubmitting(false);
+    }
+  }, 1_000);
+
+  useEffect(() => {
+    if (isEditMode && !loading && isDefined(originalFormValues)) {
+      autoSave();
+    }
+  }, [
+    formValues,
+    isRoleDirty,
+    isEditMode,
+    loading,
+    originalFormValues,
+    autoSave,
+  ]);
+
+  useEffect(() => {
+    return () => {
+      autoSave.flush();
+    };
+  }, [autoSave]);
+
   if (!isCreateMode && !loading && !agent) {
     return null;
   }
@@ -147,6 +249,16 @@ export const SettingsAgentForm = ({ mode }: { mode: 'create' | 'edit' }) => {
       title: t`Role`,
       Icon: IconLock,
     },
+    {
+      id: SETTINGS_AGENT_DETAIL_TABS.TABS_IDS.EVALS,
+      title: t`Evals`,
+      Icon: IconListCheck,
+    },
+    {
+      id: SETTINGS_AGENT_DETAIL_TABS.TABS_IDS.LOGS,
+      title: t`Logs`,
+      Icon: IconList,
+    },
   ];
 
   const handleSave = async () => {
@@ -192,6 +304,7 @@ export const SettingsAgentForm = ({ mode }: { mode: 'create' | 'edit' }) => {
           prompt: formValues.prompt,
           modelConfiguration: formValues.modelConfiguration,
           responseFormat: formValues.responseFormat,
+          evaluationInputs: formValues.evaluationInputs,
         };
 
         await createAgent({
@@ -218,6 +331,7 @@ export const SettingsAgentForm = ({ mode }: { mode: 'create' | 'edit' }) => {
             prompt: formValues.prompt,
             modelConfiguration: formValues.modelConfiguration,
             responseFormat: formValues.responseFormat,
+            evaluationInputs: formValues.evaluationInputs,
           },
         },
       });
@@ -275,6 +389,26 @@ export const SettingsAgentForm = ({ mode }: { mode: 'create' | 'edit' }) => {
             agent={agent}
           />
         );
+
+      case SETTINGS_AGENT_DETAIL_TABS.TABS_IDS.EVALS:
+        return (
+          <SettingsAgentEvalsTab
+            agentId={agentId}
+            evaluationInputs={formValues.evaluationInputs}
+            onEvaluationInputsChange={(inputs) =>
+              handleFieldChange('evaluationInputs', inputs)
+            }
+            disabled={
+              process.env.NODE_ENV === 'development'
+                ? isReadonlyMode
+                : isReadonlyMode || (isEditMode ? !agent?.isCustom : false)
+            }
+          />
+        );
+
+      case SETTINGS_AGENT_DETAIL_TABS.TABS_IDS.LOGS:
+        return <SettingsAgentLogsTab agentId={agentId} />;
+
       default:
         return <></>;
     }
@@ -286,7 +420,7 @@ export const SettingsAgentForm = ({ mode }: { mode: 'create' | 'edit' }) => {
       <SubMenuTopBarContainer
         title={title}
         actionButton={
-          isCreateMode || (isEditMode && agent?.isCustom) ? (
+          isCreateMode ? (
             <SaveAndCancelButtons
               onSave={handleSave}
               onCancel={handleCancel}
diff --git a/packages/twenty-front/src/pages/settings/ai/SettingsAgentTurnDetail.tsx b/packages/twenty-front/src/pages/settings/ai/SettingsAgentTurnDetail.tsx
new file mode 100644
index 00000000000..47fb180871d
--- /dev/null
+++ b/packages/twenty-front/src/pages/settings/ai/SettingsAgentTurnDetail.tsx
@@ -0,0 +1,251 @@
+import { AIChatAssistantMessageRenderer } from '@/ai/components/AIChatAssistantMessageRenderer';
+import { mapDBMessagesToUIMessages } from '@/ai/utils/mapDBMessagesToUIMessages';
+import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
+import { SubMenuTopBarContainer } from '@/ui/layout/page/components/SubMenuTopBarContainer';
+import { Table } from '@/ui/layout/table/components/Table';
+import { TableCell } from '@/ui/layout/table/components/TableCell';
+import { TableHeader } from '@/ui/layout/table/components/TableHeader';
+import { TableRow } from '@/ui/layout/table/components/TableRow';
+import { useQuery } from '@apollo/client';
+import styled from '@emotion/styled';
+import { t } from '@lingui/core/macro';
+import Skeleton from 'react-loading-skeleton';
+import { useParams } from 'react-router-dom';
+import { SettingsPath } from 'twenty-shared/types';
+import { getSettingsPath } from 'twenty-shared/utils';
+import { H2Title, Status } from 'twenty-ui/display';
+import { Section } from 'twenty-ui/layout';
+import { GET_AGENT_TURNS } from '@/ai/graphql/queries/getAgentTurns';
+
+const StyledTable = styled(Table)`
+  margin-top: ${({ theme }) => theme.spacing(3)};
+`;
+
+const StyledTableHeaderRow = styled(TableRow)`
+  grid-template-columns: 140px 80px 1fr;
+  margin-bottom: ${({ theme }) => theme.spacing(2)};
+`;
+
+const StyledTableRow = styled(TableRow)`
+  grid-template-columns: 140px 80px 1fr;
+`;
+
+const StyledDateCell = styled(TableCell)`
+  color: ${({ theme }) => theme.font.color.tertiary};
+`;
+
+const StyledScoreCell = styled(TableCell)`
+  align-items: center;
+  gap: ${({ theme }) => theme.spacing(2)};
+`;
+
+const StyledCommentCell = styled(TableCell)`
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+`;
+
+const StyledMessagesContainer = styled.div`
+  display: flex;
+  flex-direction: column;
+  gap: ${({ theme }) => theme.spacing(4)};
+`;
+
+const StyledMessageBubble = styled.div`
+  display: flex;
+  flex-direction: column;
+  gap: ${({ theme }) => theme.spacing(1)};
+`;
+
+const StyledMessageRole = styled.div`
+  color: ${({ theme }) => theme.font.color.tertiary};
+  font-size: ${({ theme }) => theme.font.size.sm};
+  font-weight: ${({ theme }) => theme.font.weight.medium};
+  text-transform: uppercase;
+`;
+
+const StyledMessageContent = styled.div`
+  color: ${({ theme }) => theme.font.color.primary};
+  max-width: 100%;
+`;
+
+export const SettingsAgentTurnDetail = () => {
+  const { agentId, turnId } = useParams<{
+    agentId: string;
+    turnId: string;
+  }>();
+
+  const { data, loading } = useQuery(GET_AGENT_TURNS, {
+    variables: { agentId: agentId || '' },
+    skip: !agentId,
+  });
+
+  const turn = data?.agentTurns?.find((t: any) => t.id === turnId);
+
+  const getScoreColor = (score: number) => {
+    if (score >= 80) return 'green';
+    if (score >= 60) return 'orange';
+    return 'red';
+  };
+
+  if (loading) {
+    return (
+      <SubMenuTopBarContainer
+        title={t`Turn Details`}
+        links={[
+          {
+            children: t`Workspace`,
+            href: getSettingsPath(SettingsPath.Workspace),
+          },
+          { children: t`AI`, href: getSettingsPath(SettingsPath.AI) },
+          {
+            children: t`Agent`,
+            href: getSettingsPath(SettingsPath.AIAgentDetail).replace(
+              ':agentId',
+              agentId || '',
+            ),
+          },
+          { children: t`Turn` },
+        ]}
+      >
+        <SettingsPageContainer>
+          <Skeleton height={200} />
+        </SettingsPageContainer>
+      </SubMenuTopBarContainer>
+    );
+  }
+
+  if (!turn) {
+    return (
+      <SubMenuTopBarContainer
+        title={t`Turn Not Found`}
+        links={[
+          {
+            children: t`Workspace`,
+            href: getSettingsPath(SettingsPath.Workspace),
+          },
+          { children: t`AI`, href: getSettingsPath(SettingsPath.AI) },
+          { children: t`Turn` },
+        ]}
+      >
+        <SettingsPageContainer>
+          <div>{t`Turn not found`}</div>
+        </SettingsPageContainer>
+      </SubMenuTopBarContainer>
+    );
+  }
+
+  return (
+    <SubMenuTopBarContainer
+      title={t`Turn Details`}
+      links={[
+        {
+          children: t`Workspace`,
+          href: getSettingsPath(SettingsPath.Workspace),
+        },
+        { children: t`AI`, href: getSettingsPath(SettingsPath.AI) },
+        {
+          children: t`Agent`,
+          href: getSettingsPath(SettingsPath.AIAgentDetail).replace(
+            ':agentId',
+            agentId || '',
+          ),
+        },
+        { children: t`Turn` },
+      ]}
+    >
+      <SettingsPageContainer>
+        <Section>
+          <H2Title
+            title={t`Messages`}
+            description={new Date(turn.createdAt).toLocaleString('en-US', {
+              dateStyle: 'medium',
+              timeStyle: 'short',
+            })}
+          />
+          {turn.messages && turn.messages.length > 0 ? (
+            <StyledMessagesContainer>
+              {mapDBMessagesToUIMessages(
+                [...turn.messages]
+                  .filter((msg: any) => msg.parts && msg.parts.length > 0)
+                  .sort((a: any, b: any) => {
+                    if (a.role === 'user' && b.role === 'assistant') return -1;
+                    if (a.role === 'assistant' && b.role === 'user') return 1;
+                    return (
+                      new Date(a.createdAt).getTime() -
+                      new Date(b.createdAt).getTime()
+                    );
+                  }),
+              ).map((message) => {
+                const roleLabel =
+                  message.role === 'user'
+                    ? t`User`
+                    : message.role === 'system'
+                      ? t`System`
+                      : t`Assistant`;
+                return (
+                  <StyledMessageBubble key={message.id}>
+                    <StyledMessageRole>{roleLabel}</StyledMessageRole>
+                    <StyledMessageContent>
+                      <AIChatAssistantMessageRenderer
+                        messageParts={message.parts}
+                        isLastMessageStreaming={false}
+                      />
+                    </StyledMessageContent>
+                  </StyledMessageBubble>
+                );
+              })}
+            </StyledMessagesContainer>
+          ) : (
+            <div>{t`No messages found for this turn`}</div>
+          )}
+        </Section>
+
+        <Section>
+          <H2Title title={t`Evaluations`} />
+          {turn.evaluations && turn.evaluations.length > 0 ? (
+            <StyledTable>
+              <StyledTableHeaderRow>
+                <TableHeader>{t`Date`}</TableHeader>
+                <TableHeader>{t`Score`}</TableHeader>
+                <TableHeader>{t`Comment`}</TableHeader>
+              </StyledTableHeaderRow>
+              {[...turn.evaluations]
+                .sort(
+                  (a: any, b: any) =>
+                    new Date(b.createdAt).getTime() -
+                    new Date(a.createdAt).getTime(),
+                )
+                .map((evaluation: any) => (
+                  <StyledTableRow key={evaluation.id}>
+                    <StyledDateCell>
+                      {new Date(evaluation.createdAt).toLocaleDateString(
+                        'en-US',
+                        {
+                          month: 'short',
+                          day: 'numeric',
+                          hour: '2-digit',
+                          minute: '2-digit',
+                        },
+                      )}
+                    </StyledDateCell>
+                    <StyledScoreCell>
+                      <Status
+                        color={getScoreColor(evaluation.score)}
+                        text={`${evaluation.score}`}
+                      />
+                    </StyledScoreCell>
+                    <StyledCommentCell>
+                      {evaluation.comment || t`No comment`}
+                    </StyledCommentCell>
+                  </StyledTableRow>
+                ))}
+            </StyledTable>
+          ) : (
+            <div>{t`No evaluations yet for this turn`}</div>
+          )}
+        </Section>
+      </SettingsPageContainer>
+    </SubMenuTopBarContainer>
+  );
+};
diff --git a/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentEvalsTab.tsx b/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentEvalsTab.tsx
new file mode 100644
index 00000000000..07c4f97c2dc
--- /dev/null
+++ b/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentEvalsTab.tsx
@@ -0,0 +1,193 @@
+import { RUN_EVALUATION_INPUT } from '@/ai/graphql/mutations/runEvaluationInput';
+import { SettingsListCard } from '@/settings/components/SettingsListCard';
+import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
+import { TextInput } from '@/ui/input/components/TextInput';
+import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
+import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
+import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
+import { ConfirmationModal } from '@/ui/layout/modal/components/ConfirmationModal';
+import { useModal } from '@/ui/layout/modal/hooks/useModal';
+import { useMutation } from '@apollo/client';
+import styled from '@emotion/styled';
+import { t } from '@lingui/core/macro';
+import { useState } from 'react';
+import {
+  IconDotsVertical,
+  IconMessage,
+  IconPlayerPlay,
+  IconPlus,
+  IconTrash,
+} from 'twenty-ui/display';
+import { Button, LightIconButton } from 'twenty-ui/input';
+import { Section } from 'twenty-ui/layout';
+import { MenuItem } from 'twenty-ui/navigation';
+import { v4 as uuidv4 } from 'uuid';
+
+const DELETE_EVAL_INPUT_MODAL_ID = 'delete-eval-input-modal';
+
+const StyledInputContainer = styled.div`
+  align-items: center;
+  display: flex;
+  gap: ${({ theme }) => theme.spacing(2)};
+  margin-bottom: ${({ theme }) => theme.spacing(6)};
+  margin-top: ${({ theme }) => theme.spacing(4)};
+`;
+
+const StyledEmptyMessage = styled.div`
+  color: ${({ theme }) => theme.font.color.tertiary};
+`;
+
+type SettingsAgentEvalsTabProps = {
+  agentId: string;
+  evaluationInputs: string[];
+  onEvaluationInputsChange: (inputs: string[]) => void;
+  disabled?: boolean;
+};
+
+type EvalInput = {
+  id: string;
+  text: string;
+};
+
+export const SettingsAgentEvalsTab = ({
+  agentId,
+  evaluationInputs,
+  onEvaluationInputsChange,
+  disabled = false,
+}: SettingsAgentEvalsTabProps) => {
+  const [newInput, setNewInput] = useState('');
+  const [inputToDelete, setInputToDelete] = useState<string | null>(null);
+  const { openModal } = useModal();
+  const { closeDropdown } = useCloseDropdown();
+  const { enqueueSuccessSnackBar, enqueueErrorSnackBar } = useSnackBar();
+
+  const [runEvaluationInput] = useMutation(RUN_EVALUATION_INPUT, {
+    onCompleted: () => {
+      enqueueSuccessSnackBar({
+        message: t`Evaluation input executed successfully`,
+      });
+    },
+    onError: () => {
+      enqueueErrorSnackBar({
+        message: t`Failed to execute evaluation input`,
+      });
+    },
+  });
+
+  const evalInputs: EvalInput[] = evaluationInputs.map((text) => ({
+    id: uuidv4(),
+    text,
+  }));
+
+  const handleAddInput = () => {
+    if (newInput.trim() !== '') {
+      onEvaluationInputsChange([...evaluationInputs, newInput.trim()]);
+      setNewInput('');
+    }
+  };
+
+  const handleDeleteInput = () => {
+    if (inputToDelete !== null) {
+      const index = evalInputs.findIndex((input) => input.id === inputToDelete);
+      if (index !== -1) {
+        const newInputs = [...evaluationInputs];
+        newInputs.splice(index, 1);
+        onEvaluationInputsChange(newInputs);
+      }
+      setInputToDelete(null);
+    }
+  };
+
+  const openDeleteModal = (id: string) => {
+    setInputToDelete(id);
+    openModal(DELETE_EVAL_INPUT_MODAL_ID);
+  };
+
+  const handleRunInput = (text: string, itemId: string) => {
+    runEvaluationInput({
+      variables: { agentId, input: text },
+    });
+    closeDropdown(`eval-input-dropdown-${itemId}`);
+  };
+
+  return (
+    <>
+      <Section>
+        <StyledInputContainer>
+          <TextInput
+            placeholder={t`Add test input for evaluation (e.g., "Find all customers in NY")`}
+            value={newInput}
+            onChange={setNewInput}
+            onKeyDown={(e) => {
+              if (e.key === 'Enter') {
+                e.preventDefault();
+                handleAddInput();
+              }
+            }}
+            disabled={disabled}
+            fullWidth
+          />
+          <Button
+            Icon={IconPlus}
+            variant="primary"
+            accent="blue"
+            size="small"
+            title={t`Add`}
+            onClick={handleAddInput}
+            disabled={disabled || !newInput.trim()}
+          />
+        </StyledInputContainer>
+
+        {evalInputs.length > 0 ? (
+          <SettingsListCard
+            items={evalInputs}
+            getItemLabel={(item) => item.text}
+            RowIcon={IconMessage}
+            RowRightComponent={({ item }) => (
+              <Dropdown
+                dropdownId={`eval-input-dropdown-${item.id}`}
+                dropdownPlacement="right-start"
+                clickableComponent={
+                  <LightIconButton
+                    Icon={IconDotsVertical}
+                    accent="tertiary"
+                    disabled={disabled}
+                  />
+                }
+                dropdownComponents={
+                  <DropdownContent>
+                    <DropdownMenuItemsContainer>
+                      <MenuItem
+                        LeftIcon={IconPlayerPlay}
+                        text={t`Run`}
+                        onClick={() => handleRunInput(item.text, item.id)}
+                      />
+                      <MenuItem
+                        accent="danger"
+                        LeftIcon={IconTrash}
+                        text={t`Delete`}
+                        onClick={() => openDeleteModal(item.id)}
+                      />
+                    </DropdownMenuItemsContainer>
+                  </DropdownContent>
+                }
+              />
+            )}
+            hasFooter={false}
+          />
+        ) : (
+          <StyledEmptyMessage>{t`No evaluation inputs yet. Add your first test input above.`}</StyledEmptyMessage>
+        )}
+      </Section>
+
+      <ConfirmationModal
+        modalId={DELETE_EVAL_INPUT_MODAL_ID}
+        title={t`Delete Evaluation Input`}
+        subtitle={t`Are you sure you want to delete this evaluation input?`}
+        onConfirmClick={handleDeleteInput}
+        confirmButtonText={t`Delete`}
+      />
+    </>
+  );
+};
diff --git a/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentLogsTab.tsx b/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentLogsTab.tsx
new file mode 100644
index 00000000000..6563f78591d
--- /dev/null
+++ b/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentLogsTab.tsx
@@ -0,0 +1,209 @@
+import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
+import { Table } from '@/ui/layout/table/components/Table';
+import { TableCell } from '@/ui/layout/table/components/TableCell';
+import { TableHeader } from '@/ui/layout/table/components/TableHeader';
+import { TableRow } from '@/ui/layout/table/components/TableRow';
+import { useMutation, useQuery } from '@apollo/client';
+import styled from '@emotion/styled';
+import { t } from '@lingui/core/macro';
+import Skeleton from 'react-loading-skeleton';
+import { SettingsPath } from 'twenty-shared/types';
+import { getSettingsPath } from 'twenty-shared/utils';
+import { IconChevronRight, Status } from 'twenty-ui/display';
+import { Button, LightIconButton } from 'twenty-ui/input';
+import {
+  AnimatedPlaceholder,
+  AnimatedPlaceholderEmptyContainer,
+  AnimatedPlaceholderEmptySubTitle,
+  AnimatedPlaceholderEmptyTextContainer,
+  AnimatedPlaceholderEmptyTitle,
+} from 'twenty-ui/layout';
+import { UndecoratedLink } from 'twenty-ui/navigation';
+import { EVALUATE_AGENT_TURN } from '@/ai/graphql/mutations/evaluateAgentTurn';
+import { GET_AGENT_TURNS } from '@/ai/graphql/queries/getAgentTurns';
+
+const StyledTable = styled(Table)`
+  margin-top: ${({ theme }) => theme.spacing(3)};
+`;
+
+const StyledTableHeaderRow = styled(TableRow)`
+  grid-template-columns: 140px 80px 1fr 40px;
+  margin-bottom: ${({ theme }) => theme.spacing(2)};
+`;
+
+const StyledTableRow = styled(TableRow)`
+  grid-template-columns: 140px 80px 1fr 40px;
+`;
+
+const StyledScoreCell = styled(TableCell)`
+  align-items: center;
+  gap: ${({ theme }) => theme.spacing(2)};
+`;
+
+const StyledDateCell = styled(TableCell)`
+  color: ${({ theme }) => theme.font.color.tertiary};
+`;
+
+const StyledInputCell = styled(TableCell)`
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+`;
+
+const StyledActionCell = styled(TableCell)`
+  justify-content: flex-end;
+  padding-right: ${({ theme }) => theme.spacing(2)};
+`;
+
+type SettingsAgentLogsTabProps = {
+  agentId: string;
+};
+
+export const SettingsAgentLogsTab = ({
+  agentId,
+}: SettingsAgentLogsTabProps) => {
+  const { enqueueSuccessSnackBar, enqueueErrorSnackBar } = useSnackBar();
+
+  const { data, loading, refetch } = useQuery(GET_AGENT_TURNS, {
+    variables: { agentId },
+    skip: !agentId,
+  });
+
+  const [evaluateTurn, { loading: evaluating }] = useMutation(
+    EVALUATE_AGENT_TURN,
+    {
+      onCompleted: () => {
+        enqueueSuccessSnackBar({
+          message: t`Turn evaluated successfully`,
+        });
+        refetch();
+      },
+      onError: () => {
+        enqueueErrorSnackBar({
+          message: t`Failed to evaluate turn`,
+        });
+      },
+    },
+  );
+
+  const turns = data?.agentTurns || [];
+
+  const getLatestEvaluation = (evaluations: any[]) => {
+    if (!evaluations || evaluations.length === 0) return null;
+    return [...evaluations].sort(
+      (a, b) =>
+        new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime(),
+    )[0];
+  };
+
+  const getScoreColor = (score: number) => {
+    if (score >= 80) return 'green';
+    if (score >= 60) return 'orange';
+    return 'red';
+  };
+
+  const getUserMessageInput = (messages: any[]) => {
+    const userMessage = messages?.find((message) => message.role === 'user');
+    if (!userMessage) return null;
+
+    const textParts = userMessage.parts
+      ?.filter((part: any) => part.type === 'text' && part.textContent)
+      .map((part: any) => part.textContent);
+
+    return textParts?.join(' ') || null;
+  };
+
+  if (loading) {
+    return (
+      <StyledTable>
+        <StyledTableHeaderRow>
+          <TableHeader>{t`Date`}</TableHeader>
+          <TableHeader>{t`Score`}</TableHeader>
+          <TableHeader>{t`Input`}</TableHeader>
+          <TableHeader />
+        </StyledTableHeaderRow>
+        {Array.from({ length: 3 }).map((_, index) => (
+          <Skeleton height={48} borderRadius={4} key={index} />
+        ))}
+      </StyledTable>
+    );
+  }
+
+  if (turns.length === 0) {
+    return (
+      <AnimatedPlaceholderEmptyContainer>
+        <AnimatedPlaceholder type="emptyTimeline" />
+        <AnimatedPlaceholderEmptyTextContainer>
+          <AnimatedPlaceholderEmptyTitle>
+            {t`No logs yet`}
+          </AnimatedPlaceholderEmptyTitle>
+          <AnimatedPlaceholderEmptySubTitle>
+            {t`Agent interactions will appear here once the agent is used in conversations`}
+          </AnimatedPlaceholderEmptySubTitle>
+        </AnimatedPlaceholderEmptyTextContainer>
+      </AnimatedPlaceholderEmptyContainer>
+    );
+  }
+
+  return (
+    <StyledTable>
+      <StyledTableHeaderRow>
+        <TableHeader>{t`Date`}</TableHeader>
+        <TableHeader>{t`Score`}</TableHeader>
+        <TableHeader>{t`Input`}</TableHeader>
+        <TableHeader />
+      </StyledTableHeaderRow>
+      {turns.map((turn: any) => {
+        const latestEvaluation = getLatestEvaluation(turn.evaluations);
+        const userInput = getUserMessageInput(turn.messages);
+
+        return (
+          <StyledTableRow key={turn.id}>
+            <StyledDateCell>
+              {new Date(turn.createdAt).toLocaleDateString('en-US', {
+                month: 'short',
+                day: 'numeric',
+                hour: '2-digit',
+                minute: '2-digit',
+              })}
+            </StyledDateCell>
+            <StyledScoreCell>
+              {latestEvaluation ? (
+                <Status
+                  color={getScoreColor(latestEvaluation.score)}
+                  text={`${latestEvaluation.score}`}
+                />
+              ) : (
+                <Button
+                  size="small"
+                  variant="secondary"
+                  onClick={() =>
+                    evaluateTurn({ variables: { turnId: turn.id } })
+                  }
+                  disabled={evaluating}
+                  title={t`Evaluate`}
+                />
+              )}
+            </StyledScoreCell>
+            <StyledInputCell>{userInput || t`No input`}</StyledInputCell>
+            <StyledActionCell>
+              {latestEvaluation && (
+                <UndecoratedLink
+                  to={getSettingsPath(SettingsPath.AIAgentTurnDetail)
+                    .replace(':agentId', agentId)
+                    .replace(':turnId', turn.id)}
+                >
+                  <LightIconButton
+                    Icon={IconChevronRight}
+                    title={t`View all evaluations`}
+                    accent="tertiary"
+                  />
+                </UndecoratedLink>
+              )}
+            </StyledActionCell>
+          </StyledTableRow>
+        );
+      })}
+    </StyledTable>
+  );
+};
diff --git a/packages/twenty-front/src/pages/settings/ai/constants/SettingsAgentDetailTabs.ts b/packages/twenty-front/src/pages/settings/ai/constants/SettingsAgentDetailTabs.ts
index 71fa03521fd..363736955b1 100644
--- a/packages/twenty-front/src/pages/settings/ai/constants/SettingsAgentDetailTabs.ts
+++ b/packages/twenty-front/src/pages/settings/ai/constants/SettingsAgentDetailTabs.ts
@@ -3,5 +3,7 @@ export const SETTINGS_AGENT_DETAIL_TABS = {
   TABS_IDS: {
     ROLE: 'role',
     SETTINGS: 'settings',
+    EVALS: 'evals',
+    LOGS: 'logs',
   },
 };
diff --git a/packages/twenty-front/src/pages/settings/ai/hooks/useSettingsAgentFormState.ts b/packages/twenty-front/src/pages/settings/ai/hooks/useSettingsAgentFormState.ts
index 3b74e3df426..fcbbc47b8fe 100644
--- a/packages/twenty-front/src/pages/settings/ai/hooks/useSettingsAgentFormState.ts
+++ b/packages/twenty-front/src/pages/settings/ai/hooks/useSettingsAgentFormState.ts
@@ -27,6 +27,7 @@ export const useSettingsAgentFormState = (mode: 'create' | 'edit') => {
         additionalProperties: false as const,
       },
     },
+    evaluationInputs: [],
   });
 
   const [isSubmitting, setIsSubmitting] = useState(false);
@@ -70,6 +71,7 @@ export const useSettingsAgentFormState = (mode: 'create' | 'edit') => {
             additionalProperties: false as const,
           },
         },
+        evaluationInputs: [],
       });
     }
   };
diff --git a/packages/twenty-front/src/pages/settings/ai/validation-schemas/settingsAIAgentFormSchema.ts b/packages/twenty-front/src/pages/settings/ai/validation-schemas/settingsAIAgentFormSchema.ts
index 4fde78eb0bf..1c1b27e6d0b 100644
--- a/packages/twenty-front/src/pages/settings/ai/validation-schemas/settingsAIAgentFormSchema.ts
+++ b/packages/twenty-front/src/pages/settings/ai/validation-schemas/settingsAIAgentFormSchema.ts
@@ -33,6 +33,7 @@ export const settingsAIAgentFormSchema = z.object({
       schema: z.custom<AgentResponseSchema>().optional(),
     })
     .optional(),
+  evaluationInputs: z.array(z.string()).default([]),
 });
 
 export type SettingsAIAgentFormValues = z.infer<
diff --git a/packages/twenty-server/src/database/typeorm/core/migrations/common/1763997530458-AddFastAndSmartModelsToWorkspace.ts b/packages/twenty-server/src/database/typeorm/core/migrations/common/1763997530458-AddFastAndSmartModelsToWorkspace.ts
index 713b5675f48..ab2b808c232 100644
--- a/packages/twenty-server/src/database/typeorm/core/migrations/common/1763997530458-AddFastAndSmartModelsToWorkspace.ts
+++ b/packages/twenty-server/src/database/typeorm/core/migrations/common/1763997530458-AddFastAndSmartModelsToWorkspace.ts
@@ -3,7 +3,7 @@ import { type MigrationInterface, type QueryRunner } from 'typeorm';
 import {
   DEFAULT_FAST_MODEL,
   DEFAULT_SMART_MODEL,
-} from 'src/engine/metadata-modules/ai-models/constants/ai-models.const';
+} from 'src/engine/metadata-modules/ai/ai-models/constants/ai-models.const';
 
 export class AddFastAndSmartModelsToWorkspace1763997530458
   implements MigrationInterface
diff --git a/packages/twenty-server/src/database/typeorm/core/migrations/common/1764081474225-add-agent-id-to-agent-chat-message.ts b/packages/twenty-server/src/database/typeorm/core/migrations/common/1764081474225-add-agent-id-to-agent-chat-message.ts
new file mode 100644
index 00000000000..e7a92b2a625
--- /dev/null
+++ b/packages/twenty-server/src/database/typeorm/core/migrations/common/1764081474225-add-agent-id-to-agent-chat-message.ts
@@ -0,0 +1,31 @@
+import { type MigrationInterface, type QueryRunner } from 'typeorm';
+
+export class AddAgentIdToAgentChatMessage1764081474225
+  implements MigrationInterface
+{
+  name = 'AddAgentIdToAgentChatMessage1764081474225';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "core"."agentChatMessage" ADD "agentId" uuid`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."agent" ALTER COLUMN "modelId" SET DEFAULT 'default-smart-model'`,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_f3cab3cd2160867060a2812a3d" ON "core"."agentChatMessage" ("agentId") `,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `DROP INDEX "core"."IDX_f3cab3cd2160867060a2812a3d"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."agent" ALTER COLUMN "modelId" SET DEFAULT 'auto'`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."agentChatMessage" DROP COLUMN "agentId"`,
+    );
+  }
+}
diff --git a/packages/twenty-server/src/database/typeorm/core/migrations/common/1764100000000-refactor-agent-chat-entities.ts b/packages/twenty-server/src/database/typeorm/core/migrations/common/1764100000000-refactor-agent-chat-entities.ts
new file mode 100644
index 00000000000..7e5c8e8381b
--- /dev/null
+++ b/packages/twenty-server/src/database/typeorm/core/migrations/common/1764100000000-refactor-agent-chat-entities.ts
@@ -0,0 +1,135 @@
+import { type MigrationInterface, type QueryRunner } from 'typeorm';
+
+export class RefactorAgentChatEntities1764100000000
+  implements MigrationInterface
+{
+  name = 'RefactorAgentChatEntities1764100000000';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    // Drop old tables and their constraints (data loss acceptable)
+    await queryRunner.query(
+      `DROP TABLE IF EXISTS "core"."agentChatMessagePart" CASCADE`,
+    );
+    await queryRunner.query(
+      `DROP TABLE IF EXISTS "core"."agentChatMessage" CASCADE`,
+    );
+
+    // Create agentTurn table
+    await queryRunner.query(
+      `CREATE TABLE "core"."agentTurn" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "threadId" uuid NOT NULL, "agentId" uuid, "createdAt" TIMESTAMP NOT NULL DEFAULT now(), CONSTRAINT "PK_0e3f599ba7cf6a02fc940d9f18d" PRIMARY KEY ("id"))`,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_3be906dca9d5b50fbfe40e33f0" ON "core"."agentTurn" ("threadId") `,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_e6d7c07f32e6f0f08cf639d4f5" ON "core"."agentTurn" ("agentId") `,
+    );
+
+    // Create agentMessage enum and table
+    await queryRunner.query(
+      `CREATE TYPE "core"."agentMessage_role_enum" AS ENUM('user', 'assistant')`,
+    );
+    await queryRunner.query(
+      `CREATE TABLE "core"."agentMessage" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "threadId" uuid NOT NULL, "turnId" uuid NOT NULL, "agentId" uuid, "role" "core"."agentMessage_role_enum" NOT NULL, "createdAt" TIMESTAMP NOT NULL DEFAULT now(), CONSTRAINT "PK_8c2e7b0c3c9e1b7a9e5e3f4d5c6" PRIMARY KEY ("id"))`,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_4c31daa882e3130534995bf90c" ON "core"."agentMessage" ("threadId") `,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_87dbab10ac94d9a091f8efaa67" ON "core"."agentMessage" ("turnId") `,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_48c75cb32ff0d2887ef0dc547f" ON "core"."agentMessage" ("agentId") `,
+    );
+
+    // Create agentMessagePart table
+    await queryRunner.query(
+      `CREATE TABLE "core"."agentMessagePart" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "messageId" uuid NOT NULL, "orderIndex" integer NOT NULL, "type" character varying NOT NULL, "textContent" text, "reasoningContent" text, "toolName" character varying, "toolCallId" character varying, "toolInput" jsonb, "toolOutput" jsonb, "state" character varying, "errorMessage" text, "errorDetails" jsonb, "sourceUrlSourceId" character varying, "sourceUrlUrl" character varying, "sourceUrlTitle" character varying, "sourceDocumentSourceId" character varying, "sourceDocumentMediaType" character varying, "sourceDocumentTitle" character varying, "sourceDocumentFilename" character varying, "fileMediaType" character varying, "fileFilename" character varying, "fileUrl" character varying, "providerMetadata" jsonb, "createdAt" TIMESTAMP NOT NULL DEFAULT now(), CONSTRAINT "PK_7e8c9f0b1a2b3c4d5e6f7a8b9c0" PRIMARY KEY ("id"))`,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_2aff9daad5cc3b5e15ca717334" ON "core"."agentMessagePart" ("messageId") `,
+    );
+
+    // Add foreign key constraints
+    await queryRunner.query(
+      `ALTER TABLE "core"."agentTurn" ADD CONSTRAINT "FK_3be906dca9d5b50fbfe40e33f07" FOREIGN KEY ("threadId") REFERENCES "core"."agentChatThread"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."agentMessage" ADD CONSTRAINT "FK_4c31daa882e3130534995bf90ca" FOREIGN KEY ("threadId") REFERENCES "core"."agentChatThread"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."agentMessage" ADD CONSTRAINT "FK_87dbab10ac94d9a091f8efaa67b" FOREIGN KEY ("turnId") REFERENCES "core"."agentTurn"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."agentMessagePart" ADD CONSTRAINT "FK_2aff9daad5cc3b5e15ca7173342" FOREIGN KEY ("messageId") REFERENCES "core"."agentMessage"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    // Drop foreign key constraints
+    await queryRunner.query(
+      `ALTER TABLE "core"."agentMessagePart" DROP CONSTRAINT "FK_2aff9daad5cc3b5e15ca7173342"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."agentMessage" DROP CONSTRAINT "FK_87dbab10ac94d9a091f8efaa67b"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."agentMessage" DROP CONSTRAINT "FK_4c31daa882e3130534995bf90ca"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."agentTurn" DROP CONSTRAINT "FK_3be906dca9d5b50fbfe40e33f07"`,
+    );
+
+    // Drop indexes
+    await queryRunner.query(
+      `DROP INDEX "core"."IDX_2aff9daad5cc3b5e15ca717334"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "core"."IDX_48c75cb32ff0d2887ef0dc547f"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "core"."IDX_87dbab10ac94d9a091f8efaa67"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "core"."IDX_4c31daa882e3130534995bf90c"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "core"."IDX_e6d7c07f32e6f0f08cf639d4f5"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "core"."IDX_3be906dca9d5b50fbfe40e33f0"`,
+    );
+
+    // Drop new tables
+    await queryRunner.query(`DROP TABLE "core"."agentMessagePart"`);
+    await queryRunner.query(`DROP TABLE "core"."agentMessage"`);
+    await queryRunner.query(`DROP TYPE "core"."agentMessage_role_enum"`);
+    await queryRunner.query(`DROP TABLE "core"."agentTurn"`);
+
+    // Recreate old tables with enum
+    await queryRunner.query(
+      `CREATE TYPE "core"."agentChatMessage_role_enum" AS ENUM('user', 'assistant')`,
+    );
+    await queryRunner.query(
+      `CREATE TABLE "core"."agentChatMessage" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "threadId" uuid NOT NULL, "agentId" uuid, "role" "core"."agentChatMessage_role_enum" NOT NULL, "createdAt" TIMESTAMP NOT NULL DEFAULT now(), CONSTRAINT "PK_f54a95b34e98d94251bce37a180" PRIMARY KEY ("id"))`,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_cd5b23d4e471b630137b3017ba" ON "core"."agentChatMessage" ("threadId") `,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_f3cab3cd2160867060a2812a3d" ON "core"."agentChatMessage" ("agentId") `,
+    );
+    await queryRunner.query(
+      `CREATE TABLE "core"."agentChatMessagePart" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "messageId" uuid NOT NULL, "orderIndex" integer NOT NULL, "type" character varying NOT NULL, "textContent" text, "reasoningContent" text, "toolName" character varying, "toolCallId" character varying, "toolInput" jsonb, "toolOutput" jsonb, "state" character varying, "errorMessage" text, "errorDetails" jsonb, "sourceUrlSourceId" character varying, "sourceUrlUrl" character varying, "sourceUrlTitle" character varying, "sourceDocumentSourceId" character varying, "sourceDocumentMediaType" character varying, "sourceDocumentTitle" character varying, "sourceDocumentFilename" character varying, "fileMediaType" character varying, "fileFilename" character varying, "fileUrl" character varying, "providerMetadata" jsonb, "createdAt" TIMESTAMP NOT NULL DEFAULT now(), CONSTRAINT "PK_c28499bb0699730d41e57e1fe23" PRIMARY KEY ("id"))`,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_5d4b48eeebfa7b23cd2226a874" ON "core"."agentChatMessagePart" ("messageId") `,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."agentChatMessage" ADD CONSTRAINT "FK_cd5b23d4e471b630137b3017ba6" FOREIGN KEY ("threadId") REFERENCES "core"."agentChatThread"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."agentChatMessagePart" ADD CONSTRAINT "FK_5d4b48eeebfa7b23cd2226a874f" FOREIGN KEY ("messageId") REFERENCES "core"."agentChatMessage"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+    );
+  }
+}
diff --git a/packages/twenty-server/src/database/typeorm/core/migrations/common/1764200000000-add-agent-turn-evaluation.ts b/packages/twenty-server/src/database/typeorm/core/migrations/common/1764200000000-add-agent-turn-evaluation.ts
new file mode 100644
index 00000000000..92d178062d5
--- /dev/null
+++ b/packages/twenty-server/src/database/typeorm/core/migrations/common/1764200000000-add-agent-turn-evaluation.ts
@@ -0,0 +1,42 @@
+import { type MigrationInterface, type QueryRunner } from 'typeorm';
+
+export class AddAgentTurnEvaluation1764200000000 implements MigrationInterface {
+  name = 'AddAgentTurnEvaluation1764200000000';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      CREATE TABLE "core"."agentTurnEvaluation" (
+        "id" uuid NOT NULL DEFAULT uuid_generate_v4(),
+        "turnId" uuid NOT NULL,
+        "score" int NOT NULL,
+        "comment" text,
+        "createdAt" TIMESTAMP NOT NULL DEFAULT now(),
+        CONSTRAINT "PK_agentTurnEvaluation" PRIMARY KEY ("id")
+      )
+    `);
+
+    await queryRunner.query(`
+      CREATE INDEX "IDX_c94f072dbd3c11f7df51db5293"
+      ON "core"."agentTurnEvaluation" ("turnId")
+    `);
+
+    await queryRunner.query(`
+      ALTER TABLE "core"."agentTurnEvaluation"
+      ADD CONSTRAINT "FK_c94f072dbd3c11f7df51db52934"
+      FOREIGN KEY ("turnId")
+      REFERENCES "core"."agentTurn"("id")
+      ON DELETE CASCADE ON UPDATE NO ACTION
+    `);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      ALTER TABLE "core"."agentTurnEvaluation"
+      DROP CONSTRAINT "FK_c94f072dbd3c11f7df51db52934"
+    `);
+    await queryRunner.query(`
+      DROP INDEX "core"."IDX_c94f072dbd3c11f7df51db5293"
+    `);
+    await queryRunner.query(`DROP TABLE "core"."agentTurnEvaluation"`);
+  }
+}
diff --git a/packages/twenty-server/src/database/typeorm/core/migrations/common/1764210000000-add-system-role-to-agent-message.ts b/packages/twenty-server/src/database/typeorm/core/migrations/common/1764210000000-add-system-role-to-agent-message.ts
new file mode 100644
index 00000000000..fc7f682084e
--- /dev/null
+++ b/packages/twenty-server/src/database/typeorm/core/migrations/common/1764210000000-add-system-role-to-agent-message.ts
@@ -0,0 +1,20 @@
+import { type MigrationInterface, type QueryRunner } from 'typeorm';
+
+export class AddSystemRoleToAgentMessage1764210000000
+  implements MigrationInterface
+{
+  name = 'AddSystemRoleToAgentMessage1764210000000';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      ALTER TYPE "core"."agentMessage_role_enum"
+      ADD VALUE IF NOT EXISTS 'system'
+    `);
+  }
+
+  public async down(_queryRunner: QueryRunner): Promise<void> {
+    // PostgreSQL doesn't support removing enum values
+    // We would need to recreate the enum type to remove the value
+    // which is more complex and risky, so we leave it as is
+  }
+}
diff --git a/packages/twenty-server/src/database/typeorm/core/migrations/common/1764220000000-add-evaluation-inputs-to-agent.ts b/packages/twenty-server/src/database/typeorm/core/migrations/common/1764220000000-add-evaluation-inputs-to-agent.ts
new file mode 100644
index 00000000000..55d1fc5a7b5
--- /dev/null
+++ b/packages/twenty-server/src/database/typeorm/core/migrations/common/1764220000000-add-evaluation-inputs-to-agent.ts
@@ -0,0 +1,21 @@
+import { type MigrationInterface, type QueryRunner } from 'typeorm';
+
+export class AddEvaluationInputsToAgent1764220000000
+  implements MigrationInterface
+{
+  name = 'AddEvaluationInputsToAgent1764220000000';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      ALTER TABLE "core"."agent"
+      ADD COLUMN "evaluationInputs" text[] NOT NULL DEFAULT '{}'
+    `);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      ALTER TABLE "core"."agent"
+      DROP COLUMN "evaluationInputs"
+    `);
+  }
+}
diff --git a/packages/twenty-server/src/engine/api/mcp/mcp.module.ts b/packages/twenty-server/src/engine/api/mcp/mcp.module.ts
index f20fb01f38d..6da484be389 100644
--- a/packages/twenty-server/src/engine/api/mcp/mcp.module.ts
+++ b/packages/twenty-server/src/engine/api/mcp/mcp.module.ts
@@ -13,10 +13,10 @@ import { MCPMetadataToolsService } from 'src/engine/api/mcp/services/tools/mcp-m
 import { UpdateToolsService } from 'src/engine/api/mcp/services/tools/update.tools.service';
 import { MetadataQueryBuilderModule } from 'src/engine/api/rest/metadata/query-builder/metadata-query-builder.module';
 import { RestApiModule } from 'src/engine/api/rest/rest-api.module';
-import { AiToolsModule } from 'src/engine/metadata-modules/ai-tools/ai-tools.module';
 import { TokenModule } from 'src/engine/core-modules/auth/token/token.module';
 import { FeatureFlagModule } from 'src/engine/core-modules/feature-flag/feature-flag.module';
 import { MetricsModule } from 'src/engine/core-modules/metrics/metrics.module';
+import { AiToolsModule } from 'src/engine/metadata-modules/ai/ai-tools/ai-tools.module';
 import { RoleEntity } from 'src/engine/metadata-modules/role/role.entity';
 import { UserRoleModule } from 'src/engine/metadata-modules/user-role/user-role.module';
 import { WorkspaceCacheStorageModule } from 'src/engine/workspace-cache-storage/workspace-cache-storage.module';
diff --git a/packages/twenty-server/src/engine/api/mcp/services/__tests__/mcp-protocol.service.spec.ts b/packages/twenty-server/src/engine/api/mcp/services/__tests__/mcp-protocol.service.spec.ts
index 638f8454844..cb4070ec56b 100644
--- a/packages/twenty-server/src/engine/api/mcp/services/__tests__/mcp-protocol.service.spec.ts
+++ b/packages/twenty-server/src/engine/api/mcp/services/__tests__/mcp-protocol.service.spec.ts
@@ -8,10 +8,10 @@ import { MCP_SERVER_METADATA } from 'src/engine/api/mcp/constants/mcp.const';
 import { type JsonRpc } from 'src/engine/api/mcp/dtos/json-rpc';
 import { McpProtocolService } from 'src/engine/api/mcp/services/mcp-protocol.service';
 import { McpToolExecutorService } from 'src/engine/api/mcp/services/mcp-tool-executor.service';
-import { ToolService } from 'src/engine/metadata-modules/ai-tools/services/tool.service';
 import { FeatureFlagKey } from 'src/engine/core-modules/feature-flag/enums/feature-flag-key.enum';
 import { FeatureFlagService } from 'src/engine/core-modules/feature-flag/services/feature-flag.service';
 import { type WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
+import { ToolService } from 'src/engine/metadata-modules/ai/ai-tools/services/tool.service';
 import { ADMIN_ROLE_LABEL } from 'src/engine/metadata-modules/permissions/constants/admin-role-label.constants';
 import { RoleEntity } from 'src/engine/metadata-modules/role/role.entity';
 import { UserRoleService } from 'src/engine/metadata-modules/user-role/user-role.service';
diff --git a/packages/twenty-server/src/engine/api/mcp/services/mcp-protocol.service.ts b/packages/twenty-server/src/engine/api/mcp/services/mcp-protocol.service.ts
index 62a420c6145..855213c4193 100644
--- a/packages/twenty-server/src/engine/api/mcp/services/mcp-protocol.service.ts
+++ b/packages/twenty-server/src/engine/api/mcp/services/mcp-protocol.service.ts
@@ -6,10 +6,10 @@ import { Repository } from 'typeorm';
 import { type JsonRpc } from 'src/engine/api/mcp/dtos/json-rpc';
 import { McpToolExecutorService } from 'src/engine/api/mcp/services/mcp-tool-executor.service';
 import { wrapJsonRpcResponse } from 'src/engine/api/mcp/utils/wrap-jsonrpc-response.util';
-import { ToolService } from 'src/engine/metadata-modules/ai-tools/services/tool.service';
 import { FeatureFlagKey } from 'src/engine/core-modules/feature-flag/enums/feature-flag-key.enum';
 import { FeatureFlagService } from 'src/engine/core-modules/feature-flag/services/feature-flag.service';
 import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
+import { ToolService } from 'src/engine/metadata-modules/ai/ai-tools/services/tool.service';
 import { RoleEntity } from 'src/engine/metadata-modules/role/role.entity';
 import { UserRoleService } from 'src/engine/metadata-modules/user-role/user-role.service';
 import { ADMIN_ROLE } from 'src/engine/workspace-manager/workspace-sync-metadata/standard-roles/roles/admin-role';
diff --git a/packages/twenty-server/src/engine/core-modules/application/application.entity.ts b/packages/twenty-server/src/engine/core-modules/application/application.entity.ts
index cc5713a8aa9..4bd998eedc1 100644
--- a/packages/twenty-server/src/engine/core-modules/application/application.entity.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application.entity.ts
@@ -16,7 +16,7 @@ import {
 
 import { ApplicationVariableEntity } from 'src/engine/core-modules/applicationVariable/application-variable.entity';
 import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
-import { AgentEntity } from 'src/engine/metadata-modules/ai-agent/entities/agent.entity';
+import { AgentEntity } from 'src/engine/metadata-modules/ai/ai-agent/entities/agent.entity';
 import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
 import { ServerlessFunctionEntity } from 'src/engine/metadata-modules/serverless-function/serverless-function.entity';
 
diff --git a/packages/twenty-server/src/engine/core-modules/application/application.module.ts b/packages/twenty-server/src/engine/core-modules/application/application.module.ts
index 245dac319bf..43d8be30a87 100644
--- a/packages/twenty-server/src/engine/core-modules/application/application.module.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application.module.ts
@@ -5,7 +5,7 @@ import { ApplicationEntity } from 'src/engine/core-modules/application/applicati
 import { ApplicationService } from 'src/engine/core-modules/application/application.service';
 import { WorkspaceFlatApplicationMapCacheService } from 'src/engine/core-modules/application/services/workspace-flat-application-map-cache.service';
 import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
-import { AgentEntity } from 'src/engine/metadata-modules/ai-agent/entities/agent.entity';
+import { AgentEntity } from 'src/engine/metadata-modules/ai/ai-agent/entities/agent.entity';
 import { WorkspaceManyOrAllFlatEntityMapsCacheModule } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.module';
 
 @Module({
diff --git a/packages/twenty-server/src/engine/core-modules/application/dtos/application.dto.ts b/packages/twenty-server/src/engine/core-modules/application/dtos/application.dto.ts
index e6cbbd1b371..dc8aead2fc2 100644
--- a/packages/twenty-server/src/engine/core-modules/application/dtos/application.dto.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/dtos/application.dto.ts
@@ -10,7 +10,7 @@ import {
 
 import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
 import { ApplicationVariableEntityDTO } from 'src/engine/core-modules/applicationVariable/dtos/application-variable.dto';
-import { AgentDTO } from 'src/engine/metadata-modules/ai-agent/dtos/agent.dto';
+import { AgentDTO } from 'src/engine/metadata-modules/ai/ai-agent/dtos/agent.dto';
 import { ObjectMetadataDTO } from 'src/engine/metadata-modules/object-metadata/dtos/object-metadata.dto';
 import { ServerlessFunctionDTO } from 'src/engine/metadata-modules/serverless-function/dtos/serverless-function.dto';
 
diff --git a/packages/twenty-server/src/engine/core-modules/billing/billing.module.ts b/packages/twenty-server/src/engine/core-modules/billing/billing.module.ts
index 6fb9a3a73a9..b14784cd71e 100644
--- a/packages/twenty-server/src/engine/core-modules/billing/billing.module.ts
+++ b/packages/twenty-server/src/engine/core-modules/billing/billing.module.ts
@@ -33,9 +33,9 @@ import { FeatureFlagModule } from 'src/engine/core-modules/feature-flag/feature-
 import { MessageQueueModule } from 'src/engine/core-modules/message-queue/message-queue.module';
 import { UserWorkspaceEntity } from 'src/engine/core-modules/user-workspace/user-workspace.entity';
 import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
-import { AiBillingModule } from 'src/engine/metadata-modules/ai-billing/ai-billing.module';
-import { AiModelsModule } from 'src/engine/metadata-modules/ai-models/ai-models.module';
-import { AiToolsModule } from 'src/engine/metadata-modules/ai-tools/ai-tools.module';
+import { AiBillingModule } from 'src/engine/metadata-modules/ai/ai-billing/ai-billing.module';
+import { AiModelsModule } from 'src/engine/metadata-modules/ai/ai-models/ai-models.module';
+import { AiToolsModule } from 'src/engine/metadata-modules/ai/ai-tools/ai-tools.module';
 import { DataSourceModule } from 'src/engine/metadata-modules/data-source/data-source.module';
 import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';
 
diff --git a/packages/twenty-server/src/engine/core-modules/client-config/client-config.controller.spec.ts b/packages/twenty-server/src/engine/core-modules/client-config/client-config.controller.spec.ts
index c30ef8df4d0..8a23119467c 100644
--- a/packages/twenty-server/src/engine/core-modules/client-config/client-config.controller.spec.ts
+++ b/packages/twenty-server/src/engine/core-modules/client-config/client-config.controller.spec.ts
@@ -2,11 +2,11 @@ import { Test, type TestingModule } from '@nestjs/testing';
 
 import { SupportDriver } from 'src/engine/core-modules/twenty-config/interfaces/support.interface';
 
+import { ClientConfigService } from 'src/engine/core-modules/client-config/services/client-config.service';
 import {
   type ModelId,
   ModelProvider,
-} from 'src/engine/metadata-modules/ai-models/constants/ai-models.const';
-import { ClientConfigService } from 'src/engine/core-modules/client-config/services/client-config.service';
+} from 'src/engine/metadata-modules/ai/ai-models/constants/ai-models.const';
 
 import { ClientConfigController } from './client-config.controller';
 
diff --git a/packages/twenty-server/src/engine/core-modules/client-config/client-config.entity.ts b/packages/twenty-server/src/engine/core-modules/client-config/client-config.entity.ts
index df29b651943..d581d1d41f4 100644
--- a/packages/twenty-server/src/engine/core-modules/client-config/client-config.entity.ts
+++ b/packages/twenty-server/src/engine/core-modules/client-config/client-config.entity.ts
@@ -2,14 +2,14 @@ import { Field, ObjectType, registerEnumType } from '@nestjs/graphql';
 
 import { SupportDriver } from 'src/engine/core-modules/twenty-config/interfaces/support.interface';
 
-import {
-  ModelId,
-  ModelProvider,
-} from 'src/engine/metadata-modules/ai-models/constants/ai-models.const';
 import { BillingTrialPeriodDTO } from 'src/engine/core-modules/billing/dtos/billing-trial-period.dto';
 import { CaptchaDriverType } from 'src/engine/core-modules/captcha/interfaces';
 import { FeatureFlagKey } from 'src/engine/core-modules/feature-flag/enums/feature-flag-key.enum';
 import { AuthProvidersDTO } from 'src/engine/core-modules/workspace/dtos/public-workspace-data-output';
+import {
+  ModelId,
+  ModelProvider,
+} from 'src/engine/metadata-modules/ai/ai-models/constants/ai-models.const';
 
 registerEnumType(FeatureFlagKey, {
   name: 'FeatureFlagKey',
diff --git a/packages/twenty-server/src/engine/core-modules/client-config/services/client-config.service.spec.ts b/packages/twenty-server/src/engine/core-modules/client-config/services/client-config.service.spec.ts
index 9e87190d868..f8fd0925160 100644
--- a/packages/twenty-server/src/engine/core-modules/client-config/services/client-config.service.spec.ts
+++ b/packages/twenty-server/src/engine/core-modules/client-config/services/client-config.service.spec.ts
@@ -3,12 +3,12 @@ import { Test, type TestingModule } from '@nestjs/testing';
 import { NodeEnvironment } from 'src/engine/core-modules/twenty-config/interfaces/node-environment.interface';
 import { SupportDriver } from 'src/engine/core-modules/twenty-config/interfaces/support.interface';
 
-import { AiModelRegistryService } from 'src/engine/metadata-modules/ai-models/services/ai-model-registry.service';
 import { CaptchaDriverType } from 'src/engine/core-modules/captcha/interfaces';
 import { ClientConfigService } from 'src/engine/core-modules/client-config/services/client-config.service';
 import { DomainServerConfigService } from 'src/engine/core-modules/domain/domain-server-config/services/domain-server-config.service';
 import { PUBLIC_FEATURE_FLAGS } from 'src/engine/core-modules/feature-flag/constants/public-feature-flag.const';
 import { TwentyConfigService } from 'src/engine/core-modules/twenty-config/twenty-config.service';
+import { AiModelRegistryService } from 'src/engine/metadata-modules/ai/ai-models/services/ai-model-registry.service';
 
 describe('ClientConfigService', () => {
   let service: ClientConfigService;
diff --git a/packages/twenty-server/src/engine/core-modules/client-config/services/client-config.service.ts b/packages/twenty-server/src/engine/core-modules/client-config/services/client-config.service.ts
index 2b77caf2261..61bff3c6c89 100644
--- a/packages/twenty-server/src/engine/core-modules/client-config/services/client-config.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/client-config/services/client-config.service.ts
@@ -12,14 +12,14 @@ import {
 import { DomainServerConfigService } from 'src/engine/core-modules/domain/domain-server-config/services/domain-server-config.service';
 import { PUBLIC_FEATURE_FLAGS } from 'src/engine/core-modules/feature-flag/constants/public-feature-flag.const';
 import { TwentyConfigService } from 'src/engine/core-modules/twenty-config/twenty-config.service';
-import { convertCentsToBillingCredits } from 'src/engine/metadata-modules/ai-billing/utils/convert-cents-to-billing-credits.util';
+import { convertCentsToBillingCredits } from 'src/engine/metadata-modules/ai/ai-billing/utils/convert-cents-to-billing-credits.util';
 import {
   AI_MODELS,
   DEFAULT_FAST_MODEL,
   DEFAULT_SMART_MODEL,
   ModelProvider,
-} from 'src/engine/metadata-modules/ai-models/constants/ai-models.const';
-import { AiModelRegistryService } from 'src/engine/metadata-modules/ai-models/services/ai-model-registry.service';
+} from 'src/engine/metadata-modules/ai/ai-models/constants/ai-models.const';
+import { AiModelRegistryService } from 'src/engine/metadata-modules/ai/ai-models/services/ai-model-registry.service';
 
 @Injectable()
 export class ClientConfigService {
diff --git a/packages/twenty-server/src/engine/core-modules/core-engine.module.ts b/packages/twenty-server/src/engine/core-modules/core-engine.module.ts
index b0f75c73ab9..0d13aa28063 100644
--- a/packages/twenty-server/src/engine/core-modules/core-engine.module.ts
+++ b/packages/twenty-server/src/engine/core-modules/core-engine.module.ts
@@ -5,13 +5,10 @@ import { EventEmitterModule } from '@nestjs/event-emitter';
 import { WorkspaceQueryRunnerModule } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-runner.module';
 import { ActorModule } from 'src/engine/core-modules/actor/actor.module';
 import { AdminPanelModule } from 'src/engine/core-modules/admin-panel/admin-panel.module';
-import { AiModelsModule } from 'src/engine/metadata-modules/ai-models/ai-models.module';
-import { AiToolsModule } from 'src/engine/metadata-modules/ai-tools/ai-tools.module';
-import { AiBillingModule } from 'src/engine/metadata-modules/ai-billing/ai-billing.module';
 import { ApiKeyModule } from 'src/engine/core-modules/api-key/api-key.module';
 import { AppTokenModule } from 'src/engine/core-modules/app-token/app-token.module';
-import { ApplicationModule } from 'src/engine/core-modules/application/application.module';
 import { ApplicationSyncModule } from 'src/engine/core-modules/application/application-sync.module';
+import { ApplicationModule } from 'src/engine/core-modules/application/application.module';
 import { ApprovedAccessDomainModule } from 'src/engine/core-modules/approved-access-domain/approved-access-domain.module';
 import { AuthModule } from 'src/engine/core-modules/auth/auth.module';
 import { BillingWebhookModule } from 'src/engine/core-modules/billing-webhook/billing-webhook.module';
@@ -57,6 +54,9 @@ import { WebhookModule } from 'src/engine/core-modules/webhook/webhook.module';
 import { WorkflowApiModule } from 'src/engine/core-modules/workflow/workflow-api.module';
 import { WorkspaceInvitationModule } from 'src/engine/core-modules/workspace-invitation/workspace-invitation.module';
 import { WorkspaceModule } from 'src/engine/core-modules/workspace/workspace.module';
+import { AiBillingModule } from 'src/engine/metadata-modules/ai/ai-billing/ai-billing.module';
+import { AiModelsModule } from 'src/engine/metadata-modules/ai/ai-models/ai-models.module';
+import { AiToolsModule } from 'src/engine/metadata-modules/ai/ai-tools/ai-tools.module';
 import { RoleModule } from 'src/engine/metadata-modules/role/role.module';
 import { SubscriptionsModule } from 'src/engine/subscriptions/subscriptions.module';
 import { TrashCleanupModule } from 'src/engine/trash-cleanup/trash-cleanup.module';
diff --git a/packages/twenty-server/src/engine/core-modules/record-crud/zod-schemas/record-properties.zod-schema.ts b/packages/twenty-server/src/engine/core-modules/record-crud/zod-schemas/record-properties.zod-schema.ts
index 5d675cbcac4..41bb9d6134b 100644
--- a/packages/twenty-server/src/engine/core-modules/record-crud/zod-schemas/record-properties.zod-schema.ts
+++ b/packages/twenty-server/src/engine/core-modules/record-crud/zod-schemas/record-properties.zod-schema.ts
@@ -31,7 +31,7 @@ const isFieldAvailable = (field: FieldMetadataEntity, forResponse: boolean) => {
 const getFieldZodType = (field: FieldMetadataEntity): z.ZodTypeAny => {
   switch (field.type) {
     case FieldMetadataType.UUID:
-      return z.uuidv4();
+      return z.string().uuidv4();
 
     case FieldMetadataType.TEXT:
     case FieldMetadataType.RICH_TEXT:
@@ -41,7 +41,7 @@ const getFieldZodType = (field: FieldMetadataEntity): z.ZodTypeAny => {
       return z.string().datetime();
 
     case FieldMetadataType.DATE:
-      return z.date();
+      return z.string().date();
 
     case FieldMetadataType.NUMBER: {
       const settings =
diff --git a/packages/twenty-server/src/engine/core-modules/tool/services/tool-registry.service.ts b/packages/twenty-server/src/engine/core-modules/tool/services/tool-registry.service.ts
index 3db29c89ff1..ee500c1ec8e 100644
--- a/packages/twenty-server/src/engine/core-modules/tool/services/tool-registry.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/tool/services/tool-registry.service.ts
@@ -17,7 +17,19 @@ export class ToolRegistryService {
     private readonly twentyConfigService: TwentyConfigService,
   ) {
     this.toolFactories = new Map<ToolType, () => Tool>([
-      [ToolType.HTTP_REQUEST, () => new HttpTool(twentyConfigService)],
+      [
+        ToolType.HTTP_REQUEST,
+        () => {
+          const httpTool = new HttpTool(twentyConfigService);
+
+          return {
+            description: httpTool.description,
+            inputSchema: httpTool.inputSchema,
+            execute: (params) => httpTool.execute(params),
+            flag: PermissionFlagType.HTTP_REQUEST_TOOL,
+          };
+        },
+      ],
       [
         ToolType.SEND_EMAIL,
         () => ({
diff --git a/packages/twenty-server/src/engine/core-modules/workspace/workspace.entity.ts b/packages/twenty-server/src/engine/core-modules/workspace/workspace.entity.ts
index bfaf031c89d..97c59c1c277 100644
--- a/packages/twenty-server/src/engine/core-modules/workspace/workspace.entity.ts
+++ b/packages/twenty-server/src/engine/core-modules/workspace/workspace.entity.ts
@@ -32,12 +32,12 @@ import { PublicDomainEntity } from 'src/engine/core-modules/public-domain/public
 import { WorkspaceSSOIdentityProviderEntity } from 'src/engine/core-modules/sso/workspace-sso-identity-provider.entity';
 import { UserWorkspaceEntity } from 'src/engine/core-modules/user-workspace/user-workspace.entity';
 import { WebhookEntity } from 'src/engine/core-modules/webhook/webhook.entity';
-import { AgentEntity } from 'src/engine/metadata-modules/ai-agent/entities/agent.entity';
+import { AgentEntity } from 'src/engine/metadata-modules/ai/ai-agent/entities/agent.entity';
 import {
   DEFAULT_FAST_MODEL,
   DEFAULT_SMART_MODEL,
   type ModelId,
-} from 'src/engine/metadata-modules/ai-models/constants/ai-models.const';
+} from 'src/engine/metadata-modules/ai/ai-models/constants/ai-models.const';
 import { RoleDTO } from 'src/engine/metadata-modules/role/dtos/role.dto';
 import { ViewFieldDTO } from 'src/engine/metadata-modules/view-field/dtos/view-field.dto';
 import { ViewFieldEntity } from 'src/engine/metadata-modules/view-field/entities/view-field.entity';
diff --git a/packages/twenty-server/src/engine/core-modules/workspace/workspace.module.ts b/packages/twenty-server/src/engine/core-modules/workspace/workspace.module.ts
index 241cfaca331..6afe2a6797e 100644
--- a/packages/twenty-server/src/engine/core-modules/workspace/workspace.module.ts
+++ b/packages/twenty-server/src/engine/core-modules/workspace/workspace.module.ts
@@ -29,7 +29,7 @@ import { WorkspaceWorkspaceMemberListener } from 'src/engine/core-modules/worksp
 import { workspaceAutoResolverOpts } from 'src/engine/core-modules/workspace/workspace.auto-resolver-opts';
 import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
 import { WorkspaceResolver } from 'src/engine/core-modules/workspace/workspace.resolver';
-import { AiAgentModule } from 'src/engine/metadata-modules/ai-agent/ai-agent.module';
+import { AiAgentModule } from 'src/engine/metadata-modules/ai/ai-agent/ai-agent.module';
 import { DataSourceModule } from 'src/engine/metadata-modules/data-source/data-source.module';
 import { WorkspaceManyOrAllFlatEntityMapsCacheModule } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.module';
 import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai-chat/dtos/agent-chat-message.dto.ts b/packages/twenty-server/src/engine/metadata-modules/ai-chat/dtos/agent-chat-message.dto.ts
deleted file mode 100644
index 84d987dcd42..00000000000
--- a/packages/twenty-server/src/engine/metadata-modules/ai-chat/dtos/agent-chat-message.dto.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { Field, ObjectType } from '@nestjs/graphql';
-
-import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
-
-import { AgentChatMessagePartDTO } from './agent-chat-message-part.dto';
-
-@ObjectType('AgentChatMessage')
-export class AgentChatMessageDTO {
-  @Field(() => UUIDScalarType)
-  id: string;
-
-  @Field(() => UUIDScalarType)
-  threadId: string;
-
-  @Field()
-  role: 'user' | 'assistant';
-
-  @Field(() => [AgentChatMessagePartDTO])
-  parts: AgentChatMessagePartDTO[];
-
-  @Field()
-  createdAt: Date;
-}
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai-chat/entities/agent-chat-message.entity.ts b/packages/twenty-server/src/engine/metadata-modules/ai-chat/entities/agent-chat-message.entity.ts
deleted file mode 100644
index d2e0acc42e5..00000000000
--- a/packages/twenty-server/src/engine/metadata-modules/ai-chat/entities/agent-chat-message.entity.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import {
-  Column,
-  CreateDateColumn,
-  Entity,
-  Index,
-  JoinColumn,
-  ManyToOne,
-  OneToMany,
-  PrimaryGeneratedColumn,
-  Relation,
-} from 'typeorm';
-
-import { AgentChatThreadEntity } from 'src/engine/metadata-modules/ai-chat/entities/agent-chat-thread.entity';
-
-import { AgentChatMessagePartEntity } from './agent-chat-message-part.entity';
-
-export enum AgentChatMessageRole {
-  USER = 'user',
-  ASSISTANT = 'assistant',
-}
-
-@Entity('agentChatMessage')
-export class AgentChatMessageEntity {
-  @PrimaryGeneratedColumn('uuid')
-  id: string;
-
-  @Column('uuid')
-  @Index()
-  threadId: string;
-
-  @ManyToOne(() => AgentChatThreadEntity, (thread) => thread.messages, {
-    onDelete: 'CASCADE',
-  })
-  @JoinColumn({ name: 'threadId' })
-  thread: Relation<AgentChatThreadEntity>;
-
-  @Column({ type: 'enum', enum: AgentChatMessageRole })
-  role: AgentChatMessageRole;
-
-  @OneToMany(() => AgentChatMessagePartEntity, (part) => part.message)
-  parts: Relation<AgentChatMessagePartEntity[]>;
-
-  @CreateDateColumn()
-  createdAt: Date;
-}
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai-router/ai-router.module.ts b/packages/twenty-server/src/engine/metadata-modules/ai-router/ai-router.module.ts
deleted file mode 100644
index 8846620b3df..00000000000
--- a/packages/twenty-server/src/engine/metadata-modules/ai-router/ai-router.module.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { Module } from '@nestjs/common';
-import { TypeOrmModule } from '@nestjs/typeorm';
-
-import { AiModelsModule } from 'src/engine/metadata-modules/ai-models/ai-models.module';
-import { AiToolsModule } from 'src/engine/metadata-modules/ai-tools/ai-tools.module';
-import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
-import { AgentEntity } from 'src/engine/metadata-modules/ai-agent/entities/agent.entity';
-import { ObjectMetadataModule } from 'src/engine/metadata-modules/object-metadata/object-metadata.module';
-
-import { AiRouterService } from './ai-router.service';
-
-import { AiRouterPlanGeneratorService } from './services/ai-router-plan-generator.service';
-import { AiRouterStrategyDeciderService } from './services/ai-router-strategy-decider.service';
-
-@Module({
-  imports: [
-    TypeOrmModule.forFeature([AgentEntity, WorkspaceEntity]),
-    AiModelsModule,
-    AiToolsModule,
-    ObjectMetadataModule,
-  ],
-  providers: [
-    AiRouterService,
-    AiRouterStrategyDeciderService,
-    AiRouterPlanGeneratorService,
-  ],
-  exports: [AiRouterService],
-})
-export class AiRouterModule {}
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/ai-agent-execution.module.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/ai-agent-execution.module.ts
new file mode 100644
index 00000000000..ae2e6cc499e
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/ai-agent-execution.module.ts
@@ -0,0 +1,36 @@
+import { Module } from '@nestjs/common';
+import { TypeOrmModule } from '@nestjs/typeorm';
+
+import { AiBillingModule } from 'src/engine/metadata-modules/ai/ai-billing/ai-billing.module';
+import { AiModelsModule } from 'src/engine/metadata-modules/ai/ai-models/ai-models.module';
+import { AiToolsModule } from 'src/engine/metadata-modules/ai/ai-tools/ai-tools.module';
+import { RoleTargetsEntity } from 'src/engine/metadata-modules/role/role-targets.entity';
+
+import { AgentMessagePartEntity } from './entities/agent-message-part.entity';
+import { AgentMessageEntity } from './entities/agent-message.entity';
+import { AgentTurnEntity } from './entities/agent-turn.entity';
+import { AgentAsyncExecutorService } from './services/agent-async-executor.service';
+
+@Module({
+  imports: [
+    AiBillingModule,
+    AiModelsModule,
+    AiToolsModule,
+    TypeOrmModule.forFeature([
+      AgentMessageEntity,
+      AgentMessagePartEntity,
+      AgentTurnEntity,
+      RoleTargetsEntity,
+    ]),
+  ],
+  providers: [AgentAsyncExecutorService],
+  exports: [
+    AgentAsyncExecutorService,
+    TypeOrmModule.forFeature([
+      AgentMessageEntity,
+      AgentMessagePartEntity,
+      AgentTurnEntity,
+    ]),
+  ],
+})
+export class AiAgentExecutionModule {}
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai-chat/dtos/agent-chat-message-part.dto.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/dtos/agent-message-part.dto.ts
similarity index 90%
rename from packages/twenty-server/src/engine/metadata-modules/ai-chat/dtos/agent-chat-message-part.dto.ts
rename to packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/dtos/agent-message-part.dto.ts
index bd8857caf8f..876f4e1c1ee 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai-chat/dtos/agent-chat-message-part.dto.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/dtos/agent-message-part.dto.ts
@@ -1,12 +1,12 @@
 import { Field, Int, ObjectType } from '@nestjs/graphql';
 
-import { JSONValue } from 'ai';
+import { IsDateString } from 'class-validator';
 import GraphQLJSON from 'graphql-type-json';
 
 import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
 
-@ObjectType('AgentChatMessagePart')
-export class AgentChatMessagePartDTO {
+@ObjectType('AgentMessagePart')
+export class AgentMessagePartDTO {
   @Field(() => UUIDScalarType)
   id: string;
 
@@ -77,8 +77,9 @@ export class AgentChatMessagePartDTO {
   fileUrl?: string;
 
   @Field(() => GraphQLJSON, { nullable: true })
-  providerMetadata?: Record<string, Record<string, JSONValue>>;
+  providerMetadata?: Record<string, unknown>;
 
+  @IsDateString()
   @Field()
   createdAt: Date;
 }
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/dtos/agent-message.dto.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/dtos/agent-message.dto.ts
new file mode 100644
index 00000000000..bbe26ad3fdb
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/dtos/agent-message.dto.ts
@@ -0,0 +1,31 @@
+import { Field, ObjectType } from '@nestjs/graphql';
+
+import { IsDateString } from 'class-validator';
+
+import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
+import { AgentMessagePartDTO } from 'src/engine/metadata-modules/ai/ai-agent-execution/dtos/agent-message-part.dto';
+
+@ObjectType('AgentMessage')
+export class AgentMessageDTO {
+  @Field(() => UUIDScalarType)
+  id: string;
+
+  @Field(() => UUIDScalarType)
+  threadId: string;
+
+  @Field(() => UUIDScalarType)
+  turnId: string;
+
+  @Field(() => UUIDScalarType, { nullable: true })
+  agentId: string | null;
+
+  @Field()
+  role: 'system' | 'user' | 'assistant';
+
+  @Field(() => [AgentMessagePartDTO])
+  parts: AgentMessagePartDTO[];
+
+  @IsDateString()
+  @Field()
+  createdAt: Date;
+}
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/dtos/agent-turn.dto.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/dtos/agent-turn.dto.ts
new file mode 100644
index 00000000000..70dea7ee604
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/dtos/agent-turn.dto.ts
@@ -0,0 +1,29 @@
+import { Field, ObjectType } from '@nestjs/graphql';
+
+import { IsDateString } from 'class-validator';
+
+import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
+import { AgentMessageDTO } from 'src/engine/metadata-modules/ai/ai-agent-execution/dtos/agent-message.dto';
+import { AgentTurnEvaluationDTO } from 'src/engine/metadata-modules/ai/ai-agent-monitor/dtos/agent-turn-evaluation.dto';
+
+@ObjectType('AgentTurn')
+export class AgentTurnDTO {
+  @Field(() => UUIDScalarType)
+  id: string;
+
+  @Field(() => UUIDScalarType)
+  threadId: string;
+
+  @Field(() => UUIDScalarType, { nullable: true })
+  agentId: string | null;
+
+  @Field(() => [AgentTurnEvaluationDTO])
+  evaluations: AgentTurnEvaluationDTO[];
+
+  @Field(() => [AgentMessageDTO])
+  messages: AgentMessageDTO[];
+
+  @IsDateString()
+  @Field()
+  createdAt: Date;
+}
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai-chat/entities/agent-chat-message-part.entity.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/entities/agent-message-part.entity.ts
similarity index 88%
rename from packages/twenty-server/src/engine/metadata-modules/ai-chat/entities/agent-chat-message-part.entity.ts
rename to packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/entities/agent-message-part.entity.ts
index 60581d57621..84fa5917caa 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai-chat/entities/agent-chat-message-part.entity.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/entities/agent-message-part.entity.ts
@@ -10,10 +10,10 @@ import {
   Relation,
 } from 'typeorm';
 
-import { AgentChatMessageEntity } from './agent-chat-message.entity';
+import { AgentMessageEntity } from 'src/engine/metadata-modules/ai/ai-agent-execution/entities/agent-message.entity';
 
-@Entity('agentChatMessagePart')
-export class AgentChatMessagePartEntity {
+@Entity('agentMessagePart')
+export class AgentMessagePartEntity {
   @PrimaryGeneratedColumn('uuid')
   id: string;
 
@@ -21,11 +21,11 @@ export class AgentChatMessagePartEntity {
   @Index()
   messageId: string;
 
-  @ManyToOne(() => AgentChatMessageEntity, (message) => message.parts, {
+  @ManyToOne(() => AgentMessageEntity, {
     onDelete: 'CASCADE',
   })
   @JoinColumn({ name: 'messageId' })
-  message: Relation<AgentChatMessageEntity>;
+  message: Relation<AgentMessageEntity>;
 
   @Column({ type: 'int' })
   orderIndex: number;
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/entities/agent-message.entity.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/entities/agent-message.entity.ts
new file mode 100644
index 00000000000..49841b1cabe
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/entities/agent-message.entity.ts
@@ -0,0 +1,60 @@
+import {
+  Column,
+  CreateDateColumn,
+  Entity,
+  Index,
+  JoinColumn,
+  ManyToOne,
+  OneToMany,
+  PrimaryGeneratedColumn,
+  Relation,
+} from 'typeorm';
+
+import { AgentMessagePartEntity } from 'src/engine/metadata-modules/ai/ai-agent-execution/entities/agent-message-part.entity';
+import { AgentTurnEntity } from 'src/engine/metadata-modules/ai/ai-agent-execution/entities/agent-turn.entity';
+import { AgentChatThreadEntity } from 'src/engine/metadata-modules/ai/ai-chat/entities/agent-chat-thread.entity';
+
+export enum AgentMessageRole {
+  SYSTEM = 'system',
+  USER = 'user',
+  ASSISTANT = 'assistant',
+}
+
+@Entity('agentMessage')
+export class AgentMessageEntity {
+  @PrimaryGeneratedColumn('uuid')
+  id: string;
+
+  @Column('uuid')
+  @Index()
+  threadId: string;
+
+  @ManyToOne(() => AgentChatThreadEntity, (thread) => thread.messages, {
+    onDelete: 'CASCADE',
+  })
+  @JoinColumn({ name: 'threadId' })
+  thread: Relation<AgentChatThreadEntity>;
+
+  @Column('uuid')
+  @Index()
+  turnId: string;
+
+  @ManyToOne(() => AgentTurnEntity, {
+    onDelete: 'CASCADE',
+  })
+  @JoinColumn({ name: 'turnId' })
+  turn: Relation<AgentTurnEntity>;
+
+  @Column({ type: 'uuid', nullable: true })
+  @Index()
+  agentId: string | null;
+
+  @Column({ type: 'enum', enum: AgentMessageRole })
+  role: AgentMessageRole;
+
+  @OneToMany(() => AgentMessagePartEntity, (part) => part.message)
+  parts: Relation<AgentMessagePartEntity[]>;
+
+  @CreateDateColumn()
+  createdAt: Date;
+}
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/entities/agent-turn.entity.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/entities/agent-turn.entity.ts
new file mode 100644
index 00000000000..ef033a75ffb
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/entities/agent-turn.entity.ts
@@ -0,0 +1,44 @@
+import {
+  Column,
+  CreateDateColumn,
+  Entity,
+  Index,
+  JoinColumn,
+  ManyToOne,
+  OneToMany,
+  PrimaryGeneratedColumn,
+  Relation,
+} from 'typeorm';
+
+import { AgentMessageEntity } from 'src/engine/metadata-modules/ai/ai-agent-execution/entities/agent-message.entity';
+import { AgentTurnEvaluationEntity } from 'src/engine/metadata-modules/ai/ai-agent-monitor/entities/agent-turn-evaluation.entity';
+import { AgentChatThreadEntity } from 'src/engine/metadata-modules/ai/ai-chat/entities/agent-chat-thread.entity';
+
+@Entity('agentTurn')
+export class AgentTurnEntity {
+  @PrimaryGeneratedColumn('uuid')
+  id: string;
+
+  @Column('uuid')
+  @Index()
+  threadId: string;
+
+  @ManyToOne(() => AgentChatThreadEntity, (thread) => thread.turns, {
+    onDelete: 'CASCADE',
+  })
+  @JoinColumn({ name: 'threadId' })
+  thread: Relation<AgentChatThreadEntity>;
+
+  @Column({ type: 'uuid', nullable: true })
+  @Index()
+  agentId: string | null;
+
+  @OneToMany(() => AgentMessageEntity, (message) => message.turn)
+  messages: Relation<AgentMessageEntity[]>;
+
+  @OneToMany(() => AgentTurnEvaluationEntity, (evaluation) => evaluation.turn)
+  evaluations: Relation<AgentTurnEvaluationEntity[]>;
+
+  @CreateDateColumn()
+  createdAt: Date;
+}
diff --git a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/ai-agent/services/ai-agent-executor.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/agent-async-executor.service.ts
similarity index 87%
rename from packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/ai-agent/services/ai-agent-executor.service.ts
rename to packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/agent-async-executor.service.ts
index 1cb03e44f14..8e6a99d9aab 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/ai-agent/services/ai-agent-executor.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/agent-async-executor.service.ts
@@ -11,24 +11,24 @@ import {
 import { type ActorMetadata } from 'twenty-shared/types';
 import { Repository } from 'typeorm';
 
-import { AI_TELEMETRY_CONFIG } from 'src/engine/metadata-modules/ai-models/constants/ai-telemetry.const';
-import { AiModelRegistryService } from 'src/engine/metadata-modules/ai-models/services/ai-model-registry.service';
-import { ToolAdapterService } from 'src/engine/metadata-modules/ai-tools/services/tool-adapter.service';
-import { ToolService } from 'src/engine/metadata-modules/ai-tools/services/tool.service';
-import { AgentExecutionResult } from 'src/engine/metadata-modules/ai-agent/services/agent-execution.service';
-import { AgentEntity } from 'src/engine/metadata-modules/ai-agent/entities/agent.entity';
 import {
   AgentException,
   AgentExceptionCode,
-} from 'src/engine/metadata-modules/ai-agent/agent.exception';
-import { AGENT_CONFIG } from 'src/engine/metadata-modules/ai-agent/constants/agent-config.const';
-import { AGENT_SYSTEM_PROMPTS } from 'src/engine/metadata-modules/ai-agent/constants/agent-system-prompts.const';
+} from 'src/engine/metadata-modules/ai/ai-agent/agent.exception';
+import { AGENT_CONFIG } from 'src/engine/metadata-modules/ai/ai-agent/constants/agent-config.const';
+import { AGENT_SYSTEM_PROMPTS } from 'src/engine/metadata-modules/ai/ai-agent/constants/agent-system-prompts.const';
+import { AgentEntity } from 'src/engine/metadata-modules/ai/ai-agent/entities/agent.entity';
+import { AgentExecutionResult } from 'src/engine/metadata-modules/ai/ai-agent/services/agent-execution.service';
+import { AI_TELEMETRY_CONFIG } from 'src/engine/metadata-modules/ai/ai-models/constants/ai-telemetry.const';
+import { AiModelRegistryService } from 'src/engine/metadata-modules/ai/ai-models/services/ai-model-registry.service';
+import { ToolAdapterService } from 'src/engine/metadata-modules/ai/ai-tools/services/tool-adapter.service';
+import { ToolService } from 'src/engine/metadata-modules/ai/ai-tools/services/tool.service';
 import { RoleTargetsEntity } from 'src/engine/metadata-modules/role/role-targets.entity';
 import { type RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config';
 
 @Injectable()
-export class AiAgentExecutorService {
-  private readonly logger = new Logger(AiAgentExecutorService.name);
+export class AgentAsyncExecutorService {
+  private readonly logger = new Logger(AgentAsyncExecutorService.name);
   constructor(
     private readonly aiModelRegistryService: AiModelRegistryService,
     private readonly toolAdapterService: ToolAdapterService,
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai-chat/utils/mapUIMessagePartsToDBParts.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/utils/mapUIMessagePartsToDBParts.ts
similarity index 90%
rename from packages/twenty-server/src/engine/metadata-modules/ai-chat/utils/mapUIMessagePartsToDBParts.ts
rename to packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/utils/mapUIMessagePartsToDBParts.ts
index 31b094d1ed2..ee7a3c5dfd3 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai-chat/utils/mapUIMessagePartsToDBParts.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/utils/mapUIMessagePartsToDBParts.ts
@@ -1,7 +1,7 @@
 import { type ToolUIPart } from 'ai';
 import { type ExtendedUIMessagePart } from 'twenty-shared/ai';
 
-import { type AgentChatMessagePartEntity } from 'src/engine/metadata-modules/ai-chat/entities/agent-chat-message-part.entity';
+import { type AgentMessagePartEntity } from 'src/engine/metadata-modules/ai/ai-agent-execution/entities/agent-message-part.entity';
 
 const isToolPart = (part: ExtendedUIMessagePart): part is ToolUIPart => {
   return part.type.includes('tool-') && 'toolCallId' in part;
@@ -10,9 +10,9 @@ const isToolPart = (part: ExtendedUIMessagePart): part is ToolUIPart => {
 export const mapUIMessagePartsToDBParts = (
   uiMessageParts: ExtendedUIMessagePart[],
   messageId: string,
-): Partial<AgentChatMessagePartEntity>[] => {
+): Partial<AgentMessagePartEntity>[] => {
   return uiMessageParts.map((part, index) => {
-    const basePart: Partial<AgentChatMessagePartEntity> = {
+    const basePart: Partial<AgentMessagePartEntity> = {
       messageId,
       orderIndex: index,
       type: part.type,
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-monitor/ai-agent-monitor.module.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-monitor/ai-agent-monitor.module.ts
new file mode 100644
index 00000000000..3e32563338f
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-monitor/ai-agent-monitor.module.ts
@@ -0,0 +1,32 @@
+import { Module } from '@nestjs/common';
+import { TypeOrmModule } from '@nestjs/typeorm';
+
+import { AiAgentExecutionModule } from 'src/engine/metadata-modules/ai/ai-agent-execution/ai-agent-execution.module';
+import { AiAgentModule } from 'src/engine/metadata-modules/ai/ai-agent/ai-agent.module';
+import { AgentEntity } from 'src/engine/metadata-modules/ai/ai-agent/entities/agent.entity';
+import { AiChatModule } from 'src/engine/metadata-modules/ai/ai-chat/ai-chat.module';
+import { AgentChatThreadEntity } from 'src/engine/metadata-modules/ai/ai-chat/entities/agent-chat-thread.entity';
+import { AiModelsModule } from 'src/engine/metadata-modules/ai/ai-models/ai-models.module';
+import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';
+
+import { AgentTurnEvaluationEntity } from './entities/agent-turn-evaluation.entity';
+import { AgentTurnResolver } from './resolvers/agent-turn.resolver';
+import { AgentTurnGraderService } from './services/agent-turn-grader.service';
+
+@Module({
+  imports: [
+    TypeOrmModule.forFeature([
+      AgentTurnEvaluationEntity,
+      AgentEntity,
+      AgentChatThreadEntity,
+    ]),
+    AiAgentModule,
+    AiAgentExecutionModule,
+    AiChatModule,
+    AiModelsModule,
+    PermissionsModule,
+  ],
+  providers: [AgentTurnGraderService, AgentTurnResolver],
+  exports: [AgentTurnGraderService],
+})
+export class AiAgentMonitorModule {}
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-monitor/dtos/agent-turn-evaluation.dto.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-monitor/dtos/agent-turn-evaluation.dto.ts
new file mode 100644
index 00000000000..150217ed84a
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-monitor/dtos/agent-turn-evaluation.dto.ts
@@ -0,0 +1,24 @@
+import { Field, Int, ObjectType } from '@nestjs/graphql';
+
+import { IsDateString } from 'class-validator';
+
+import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
+
+@ObjectType('AgentTurnEvaluation')
+export class AgentTurnEvaluationDTO {
+  @Field(() => UUIDScalarType)
+  id: string;
+
+  @Field(() => UUIDScalarType)
+  turnId: string;
+
+  @Field(() => Int)
+  score: number;
+
+  @Field({ nullable: true })
+  comment?: string;
+
+  @IsDateString()
+  @Field()
+  createdAt: Date;
+}
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-monitor/entities/agent-turn-evaluation.entity.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-monitor/entities/agent-turn-evaluation.entity.ts
new file mode 100644
index 00000000000..d6eb6c40267
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-monitor/entities/agent-turn-evaluation.entity.ts
@@ -0,0 +1,37 @@
+import {
+  Column,
+  CreateDateColumn,
+  Entity,
+  Index,
+  JoinColumn,
+  ManyToOne,
+  PrimaryGeneratedColumn,
+  Relation,
+} from 'typeorm';
+
+import { AgentTurnEntity } from 'src/engine/metadata-modules/ai/ai-agent-execution/entities/agent-turn.entity';
+
+@Entity('agentTurnEvaluation')
+export class AgentTurnEvaluationEntity {
+  @PrimaryGeneratedColumn('uuid')
+  id: string;
+
+  @Column('uuid')
+  @Index()
+  turnId: string;
+
+  @ManyToOne(() => AgentTurnEntity, {
+    onDelete: 'CASCADE',
+  })
+  @JoinColumn({ name: 'turnId' })
+  turn: Relation<AgentTurnEntity>;
+
+  @Column({ type: 'int' })
+  score: number;
+
+  @Column({ type: 'text', nullable: true })
+  comment: string | null;
+
+  @CreateDateColumn()
+  createdAt: Date;
+}
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-monitor/resolvers/agent-turn.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-monitor/resolvers/agent-turn.resolver.ts
new file mode 100644
index 00000000000..65737e01e2f
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-monitor/resolvers/agent-turn.resolver.ts
@@ -0,0 +1,125 @@
+import { UseGuards } from '@nestjs/common';
+import { Args, Mutation, Query, Resolver } from '@nestjs/graphql';
+import { InjectRepository } from '@nestjs/typeorm';
+
+import { Repository } from 'typeorm';
+
+import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
+import { type WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
+import { AuthUserWorkspaceId } from 'src/engine/decorators/auth/auth-user-workspace-id.decorator';
+import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
+import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';
+import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+import { AgentTurnDTO } from 'src/engine/metadata-modules/ai/ai-agent-execution/dtos/agent-turn.dto';
+import { AgentTurnEntity } from 'src/engine/metadata-modules/ai/ai-agent-execution/entities/agent-turn.entity';
+import { AgentAsyncExecutorService } from 'src/engine/metadata-modules/ai/ai-agent-execution/services/agent-async-executor.service';
+import { AgentTurnEvaluationDTO } from 'src/engine/metadata-modules/ai/ai-agent-monitor/dtos/agent-turn-evaluation.dto';
+import { AgentTurnGraderService } from 'src/engine/metadata-modules/ai/ai-agent-monitor/services/agent-turn-grader.service';
+import { AgentEntity } from 'src/engine/metadata-modules/ai/ai-agent/entities/agent.entity';
+import { AgentChatThreadEntity } from 'src/engine/metadata-modules/ai/ai-chat/entities/agent-chat-thread.entity';
+import { AgentChatService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-chat.service';
+import { PermissionFlagType } from 'src/engine/metadata-modules/permissions/constants/permission-flag-type.constants';
+
+@UseGuards(WorkspaceAuthGuard, SettingsPermissionGuard(PermissionFlagType.AI))
+@Resolver()
+export class AgentTurnResolver {
+  constructor(
+    @InjectRepository(AgentTurnEntity)
+    private readonly turnRepository: Repository<AgentTurnEntity>,
+    @InjectRepository(AgentChatThreadEntity)
+    private readonly threadRepository: Repository<AgentChatThreadEntity>,
+    @InjectRepository(AgentEntity)
+    private readonly agentRepository: Repository<AgentEntity>,
+    private readonly graderService: AgentTurnGraderService,
+    private readonly aiAgentExecutorService: AgentAsyncExecutorService,
+    private readonly agentChatService: AgentChatService,
+  ) {}
+
+  @Query(() => [AgentTurnDTO])
+  async agentTurns(
+    @Args('agentId', { type: () => UUIDScalarType }) agentId: string,
+  ): Promise<AgentTurnDTO[]> {
+    const turns = await this.turnRepository.find({
+      where: { agentId },
+      relations: ['evaluations', 'messages', 'messages.parts'],
+      order: { createdAt: 'DESC' },
+    });
+
+    return turns as unknown as AgentTurnDTO[];
+  }
+
+  @Mutation(() => AgentTurnEvaluationDTO)
+  async evaluateAgentTurn(
+    @Args('turnId', { type: () => UUIDScalarType }) turnId: string,
+  ): Promise<AgentTurnEvaluationDTO> {
+    const evaluation = await this.graderService.evaluateTurn(turnId);
+
+    return evaluation as unknown as AgentTurnEvaluationDTO;
+  }
+
+  @Mutation(() => AgentTurnDTO)
+  async runEvaluationInput(
+    @Args('agentId', { type: () => UUIDScalarType }) agentId: string,
+    @Args('input') input: string,
+    @AuthWorkspace() workspace: WorkspaceEntity,
+    @AuthUserWorkspaceId() userWorkspaceId: string,
+  ): Promise<AgentTurnDTO> {
+    const thread = this.threadRepository.create({
+      userWorkspaceId,
+      title: `Eval: ${input.substring(0, 50)}...`,
+    });
+    const savedThread = await this.threadRepository.save(thread);
+
+    const turn = this.turnRepository.create({
+      threadId: savedThread.id,
+      agentId,
+    });
+    const savedTurn = await this.turnRepository.save(turn);
+
+    const agent = await this.agentRepository.findOne({
+      where: { id: agentId },
+    });
+
+    await this.agentChatService.addMessage({
+      threadId: savedThread.id,
+      turnId: savedTurn.id,
+      uiMessage: {
+        role: 'user',
+        parts: [{ type: 'text', text: input }],
+      },
+    });
+
+    const executionResult = await this.aiAgentExecutorService.executeAgent({
+      agent,
+      userPrompt: input,
+    });
+
+    await this.agentChatService.addMessage({
+      threadId: savedThread.id,
+      turnId: savedTurn.id,
+      agentId: agent?.id,
+      uiMessage: {
+        role: 'assistant',
+        parts: [
+          {
+            type: 'text',
+            text: JSON.stringify(executionResult.result) || '',
+          },
+        ],
+      },
+    });
+
+    await this.graderService.evaluateTurn(savedTurn.id);
+
+    const turnWithEvaluations = await this.turnRepository.findOne({
+      where: { id: savedTurn.id },
+      relations: ['evaluations', 'messages', 'messages.parts'],
+    });
+
+    if (!turnWithEvaluations) {
+      throw new Error('Turn not found after execution');
+    }
+
+    return turnWithEvaluations as unknown as AgentTurnDTO;
+  }
+}
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-monitor/services/agent-turn-grader.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-monitor/services/agent-turn-grader.service.ts
new file mode 100644
index 00000000000..22797b5dfc2
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-monitor/services/agent-turn-grader.service.ts
@@ -0,0 +1,183 @@
+import { Injectable, Logger } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+
+import { generateText } from 'ai';
+import { Repository } from 'typeorm';
+
+import { AgentMessageEntity } from 'src/engine/metadata-modules/ai/ai-agent-execution/entities/agent-message.entity';
+import { AgentTurnEntity } from 'src/engine/metadata-modules/ai/ai-agent-execution/entities/agent-turn.entity';
+import { AgentTurnEvaluationEntity } from 'src/engine/metadata-modules/ai/ai-agent-monitor/entities/agent-turn-evaluation.entity';
+import { AI_TELEMETRY_CONFIG } from 'src/engine/metadata-modules/ai/ai-models/constants/ai-telemetry.const';
+import { AiModelRegistryService } from 'src/engine/metadata-modules/ai/ai-models/services/ai-model-registry.service';
+
+@Injectable()
+export class AgentTurnGraderService {
+  private readonly logger = new Logger(AgentTurnGraderService.name);
+
+  constructor(
+    @InjectRepository(AgentTurnEntity)
+    private readonly turnRepository: Repository<AgentTurnEntity>,
+    @InjectRepository(AgentTurnEvaluationEntity)
+    private readonly evaluationRepository: Repository<AgentTurnEvaluationEntity>,
+    private readonly aiModelRegistryService: AiModelRegistryService,
+  ) {}
+
+  async evaluateTurn(turnId: string): Promise<AgentTurnEvaluationEntity> {
+    const turn = await this.turnRepository.findOne({
+      where: { id: turnId },
+      relations: ['messages', 'messages.parts'],
+    });
+
+    if (!turn) {
+      throw new Error(`Turn ${turnId} not found`);
+    }
+
+    const { score, comment } = await this.evaluateWithAI(turn);
+
+    const evaluation = this.evaluationRepository.create({
+      turnId,
+      score,
+      comment,
+    });
+
+    return this.evaluationRepository.save(evaluation);
+  }
+
+  private async evaluateWithAI(
+    turn: AgentTurnEntity & { messages: AgentMessageEntity[] },
+  ): Promise<{ score: number; comment: string }> {
+    try {
+      const defaultModel = this.aiModelRegistryService.getDefaultSpeedModel();
+
+      if (!defaultModel) {
+        this.logger.warn('No default AI model available for evaluation');
+
+        return this.getFallbackEvaluation(turn);
+      }
+
+      const evaluationContext = this.buildEvaluationContext(turn);
+
+      const prompt = `You are evaluating an AI agent's performance on a single turn (user request + agent response).
+
+${evaluationContext}
+
+Evaluate this agent turn based on:
+1. **Task Completion**: Did the agent accomplish what the user asked?
+2. **Tool Usage**: Were tools used correctly and appropriately?
+3. **Response Quality**: Is the response clear, accurate, and helpful?
+4. **Error Handling**: Were errors handled gracefully?
+
+Provide:
+- A score from 0 to 100 (0 = complete failure, 100 = perfect)
+- A brief comment explaining the score (max 200 characters)
+
+Respond ONLY with valid JSON in this exact format:
+{"score": <number>, "comment": "<string>"}`;
+
+      const result = await generateText({
+        model: defaultModel.model,
+        prompt,
+        temperature: 0.3,
+        experimental_telemetry: AI_TELEMETRY_CONFIG,
+      });
+
+      const parsed = JSON.parse(result.text);
+
+      return {
+        score: Math.max(0, Math.min(100, Math.round(parsed.score))),
+        comment: (parsed.comment || 'Evaluation completed').substring(0, 500),
+      };
+    } catch (error) {
+      this.logger.error('Failed to evaluate turn with AI:', error);
+
+      return this.getFallbackEvaluation(turn);
+    }
+  }
+
+  private buildEvaluationContext(
+    turn: AgentTurnEntity & { messages: AgentMessageEntity[] },
+  ): string {
+    const userMessages = turn.messages.filter((m) => m.role === 'user');
+    const assistantMessages = turn.messages.filter(
+      (m) => m.role === 'assistant',
+    );
+
+    const userText = userMessages
+      .flatMap((m) => m.parts || [])
+      .filter((p) => p.textContent)
+      .map((p) => p.textContent)
+      .join('\n');
+
+    const assistantParts = assistantMessages.flatMap((m) => m.parts || []);
+
+    const assistantText = assistantParts
+      .filter((p) => p.textContent)
+      .map((p) => p.textContent)
+      .join('\n');
+
+    const toolCalls = assistantParts
+      .filter((p) => p.toolName)
+      .map((p) => ({
+        tool: p.toolName,
+        hasError: !!p.errorMessage,
+        error: p.errorMessage,
+      }));
+
+    const errors = assistantParts
+      .filter((p) => p.errorMessage)
+      .map((p) => p.errorMessage);
+
+    let context = `**User Request:**\n${userText || '(no text)'}\n\n`;
+
+    context += `**Agent Response:**\n${assistantText || '(no text response)'}\n\n`;
+
+    if (toolCalls.length > 0) {
+      context += `**Tools Used:**\n${toolCalls.map((t) => `- ${t.tool}${t.hasError ? ' (FAILED)' : ''}`).join('\n')}\n\n`;
+    }
+
+    if (errors.length > 0) {
+      context += `**Errors:**\n${errors.map((e) => `- ${e}`).join('\n')}\n\n`;
+    }
+
+    return context;
+  }
+
+  private getFallbackEvaluation(
+    turn: AgentTurnEntity & { messages: AgentMessageEntity[] },
+  ): {
+    score: number;
+    comment: string;
+  } {
+    const parts = turn.messages.flatMap((m) => m.parts || []);
+    const errorCount = parts.filter((p) => p.errorMessage).length;
+    const hasResponse = parts.some((p) => p.textContent);
+    const toolCount = parts.filter((p) => p.toolName).length;
+
+    let score = 100;
+
+    if (errorCount > 0) {
+      score -= errorCount * 30;
+    }
+
+    if (!hasResponse) {
+      score -= 50;
+    }
+
+    const comments = [];
+
+    if (errorCount > 0) {
+      comments.push(`${errorCount} error(s)`);
+    }
+    if (toolCount > 0) {
+      comments.push(`${toolCount} tool(s) used`);
+    }
+    if (!hasResponse) {
+      comments.push('No response');
+    }
+
+    return {
+      score: Math.max(0, score),
+      comment: comments.length > 0 ? comments.join('; ') : 'Completed',
+    };
+  }
+}
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai-agent-role/agent-role.service.spec.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-role/agent-role.service.spec.ts
similarity index 97%
rename from packages/twenty-server/src/engine/metadata-modules/ai-agent-role/agent-role.service.spec.ts
rename to packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-role/agent-role.service.spec.ts
index cac7dc3590a..2687293d68c 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai-agent-role/agent-role.service.spec.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-role/agent-role.service.spec.ts
@@ -3,12 +3,12 @@ import { getRepositoryToken } from '@nestjs/typeorm';
 
 import { type Repository } from 'typeorm';
 
-import { type ModelId } from 'src/engine/metadata-modules/ai-models/constants/ai-models.const';
-import { AgentEntity } from 'src/engine/metadata-modules/ai-agent/entities/agent.entity';
 import {
   AgentException,
   AgentExceptionCode,
-} from 'src/engine/metadata-modules/ai-agent/agent.exception';
+} from 'src/engine/metadata-modules/ai/ai-agent/agent.exception';
+import { AgentEntity } from 'src/engine/metadata-modules/ai/ai-agent/entities/agent.entity';
+import { type ModelId } from 'src/engine/metadata-modules/ai/ai-models/constants/ai-models.const';
 import { RoleTargetsEntity } from 'src/engine/metadata-modules/role/role-targets.entity';
 import { RoleEntity } from 'src/engine/metadata-modules/role/role.entity';
 
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai-agent-role/ai-agent-role.module.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-role/ai-agent-role.module.ts
similarity index 85%
rename from packages/twenty-server/src/engine/metadata-modules/ai-agent-role/ai-agent-role.module.ts
rename to packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-role/ai-agent-role.module.ts
index d0776340f49..b19418bb74d 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai-agent-role/ai-agent-role.module.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-role/ai-agent-role.module.ts
@@ -1,7 +1,7 @@
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
 
-import { AgentEntity } from 'src/engine/metadata-modules/ai-agent/entities/agent.entity';
+import { AgentEntity } from 'src/engine/metadata-modules/ai/ai-agent/entities/agent.entity';
 import { RoleTargetsEntity } from 'src/engine/metadata-modules/role/role-targets.entity';
 import { RoleEntity } from 'src/engine/metadata-modules/role/role.entity';
 
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai-agent-role/ai-agent-role.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-role/ai-agent-role.service.ts
similarity index 96%
rename from packages/twenty-server/src/engine/metadata-modules/ai-agent-role/ai-agent-role.service.ts
rename to packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-role/ai-agent-role.service.ts
index a5aa4df59b8..520ebba7461 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai-agent-role/ai-agent-role.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-role/ai-agent-role.service.ts
@@ -3,11 +3,11 @@ import { InjectRepository } from '@nestjs/typeorm';
 
 import { In, IsNull, Not, Repository } from 'typeorm';
 
-import { AgentEntity } from 'src/engine/metadata-modules/ai-agent/entities/agent.entity';
 import {
   AgentException,
   AgentExceptionCode,
-} from 'src/engine/metadata-modules/ai-agent/agent.exception';
+} from 'src/engine/metadata-modules/ai/ai-agent/agent.exception';
+import { AgentEntity } from 'src/engine/metadata-modules/ai/ai-agent/entities/agent.entity';
 import { RoleTargetsEntity } from 'src/engine/metadata-modules/role/role-targets.entity';
 import { RoleEntity } from 'src/engine/metadata-modules/role/role.entity';
 
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai-agent/agent.exception.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/agent.exception.ts
similarity index 100%
rename from packages/twenty-server/src/engine/metadata-modules/ai-agent/agent.exception.ts
rename to packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/agent.exception.ts
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai-agent/agent.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/agent.resolver.ts
similarity index 100%
rename from packages/twenty-server/src/engine/metadata-modules/ai-agent/agent.resolver.ts
rename to packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/agent.resolver.ts
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai-agent/agent.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/agent.service.ts
similarity index 98%
rename from packages/twenty-server/src/engine/metadata-modules/ai-agent/agent.service.ts
rename to packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/agent.service.ts
index d55b7648a1e..1921b1c4e76 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai-agent/agent.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/agent.service.ts
@@ -4,9 +4,9 @@ import { InjectRepository } from '@nestjs/typeorm';
 import { isNonEmptyString } from '@sniptt/guards';
 import { In, Repository } from 'typeorm';
 
-import { AiAgentRoleService } from 'src/engine/metadata-modules/ai-agent-role/ai-agent-role.service';
-import { type CreateAgentInput } from 'src/engine/metadata-modules/ai-agent/dtos/create-agent.input';
-import { type UpdateAgentInput } from 'src/engine/metadata-modules/ai-agent/dtos/update-agent.input';
+import { AiAgentRoleService } from 'src/engine/metadata-modules/ai/ai-agent-role/ai-agent-role.service';
+import { type CreateAgentInput } from 'src/engine/metadata-modules/ai/ai-agent/dtos/create-agent.input';
+import { type UpdateAgentInput } from 'src/engine/metadata-modules/ai/ai-agent/dtos/update-agent.input';
 import { RoleTargetsEntity } from 'src/engine/metadata-modules/role/role-targets.entity';
 import { computeMetadataNameFromLabel } from 'src/engine/metadata-modules/utils/compute-metadata-name-from-label.util';
 
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai-agent/ai-agent.module.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/ai-agent.module.ts
similarity index 87%
rename from packages/twenty-server/src/engine/metadata-modules/ai-agent/ai-agent.module.ts
rename to packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/ai-agent.module.ts
index dd9c8b09133..5756b9add74 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai-agent/ai-agent.module.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/ai-agent.module.ts
@@ -10,11 +10,11 @@ import { FileModule } from 'src/engine/core-modules/file/file.module';
 import { ThrottlerModule } from 'src/engine/core-modules/throttler/throttler.module';
 import { UserWorkspaceModule } from 'src/engine/core-modules/user-workspace/user-workspace.module';
 import { UserModule } from 'src/engine/core-modules/user/user.module';
-import { AiAgentRoleModule } from 'src/engine/metadata-modules/ai-agent-role/ai-agent-role.module';
-import { AiBillingModule } from 'src/engine/metadata-modules/ai-billing/ai-billing.module';
-import { AiModelsModule } from 'src/engine/metadata-modules/ai-models/ai-models.module';
-import { AiRouterModule } from 'src/engine/metadata-modules/ai-router/ai-router.module';
-import { AiToolsModule } from 'src/engine/metadata-modules/ai-tools/ai-tools.module';
+import { AiAgentRoleModule } from 'src/engine/metadata-modules/ai/ai-agent-role/ai-agent-role.module';
+import { AiBillingModule } from 'src/engine/metadata-modules/ai/ai-billing/ai-billing.module';
+import { AiChatRouterModule } from 'src/engine/metadata-modules/ai/ai-chat-router/ai-chat-router.module';
+import { AiModelsModule } from 'src/engine/metadata-modules/ai/ai-models/ai-models.module';
+import { AiToolsModule } from 'src/engine/metadata-modules/ai/ai-tools/ai-tools.module';
 import { ObjectMetadataModule } from 'src/engine/metadata-modules/object-metadata/object-metadata.module';
 import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';
 import { RoleTargetsEntity } from 'src/engine/metadata-modules/role/role-targets.entity';
@@ -48,7 +48,7 @@ import { AgentToolGeneratorService } from './services/agent-tool-generator.servi
     FileModule,
     ObjectMetadataModule,
     PermissionsModule,
-    AiRouterModule,
+    AiChatRouterModule,
     WorkspacePermissionsCacheModule,
     WorkspaceCacheStorageModule,
     TokenModule,
@@ -63,17 +63,19 @@ import { AgentToolGeneratorService } from './services/agent-tool-generator.servi
     AgentService,
     AgentExecutionService,
     AgentModelConfigService,
-    AgentToolGeneratorService,
     AgentPlanExecutorService,
+    AgentToolGeneratorService,
     AgentTitleGenerationService,
     AgentActorContextService,
   ],
   exports: [
     AgentService,
     AgentExecutionService,
-    AgentToolGeneratorService,
     AgentPlanExecutorService,
+    AgentToolGeneratorService,
     AgentTitleGenerationService,
+    AgentActorContextService,
+    AgentModelConfigService,
     TypeOrmModule.forFeature([AgentEntity]),
   ],
 })
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai-agent/constants/agent-config.const.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/constants/agent-config.const.ts
similarity index 100%
rename from packages/twenty-server/src/engine/metadata-modules/ai-agent/constants/agent-config.const.ts
rename to packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/constants/agent-config.const.ts
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai-agent/constants/agent-system-prompts.const.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/constants/agent-system-prompts.const.ts
similarity index 100%
rename from packages/twenty-server/src/engine/metadata-modules/ai-agent/constants/agent-system-prompts.const.ts
rename to packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/constants/agent-system-prompts.const.ts
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai-agent/dtos/agent-id.input.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/dtos/agent-id.input.ts
similarity index 100%
rename from packages/twenty-server/src/engine/metadata-modules/ai-agent/dtos/agent-id.input.ts
rename to packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/dtos/agent-id.input.ts
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai-agent/dtos/agent.dto.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/dtos/agent.dto.ts
similarity index 88%
rename from packages/twenty-server/src/engine/metadata-modules/ai-agent/dtos/agent.dto.ts
rename to packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/dtos/agent.dto.ts
index 779d4d19917..d52d6cbc323 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai-agent/dtos/agent.dto.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/dtos/agent.dto.ts
@@ -10,8 +10,8 @@ import {
 import GraphQLJSON from 'graphql-type-json';
 
 import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
-import { ModelId } from 'src/engine/metadata-modules/ai-models/constants/ai-models.const';
-import { ModelConfiguration } from 'src/engine/metadata-modules/ai-agent/types/modelConfiguration';
+import { ModelConfiguration } from 'src/engine/metadata-modules/ai/ai-agent/types/modelConfiguration';
+import { ModelId } from 'src/engine/metadata-modules/ai/ai-models/constants/ai-models.const';
 
 @ObjectType('Agent')
 export class AgentDTO {
@@ -73,4 +73,7 @@ export class AgentDTO {
 
   @Field(() => GraphQLJSON, { nullable: true })
   modelConfiguration: ModelConfiguration;
+
+  @Field(() => [String])
+  evaluationInputs: string[];
 }
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai-agent/dtos/create-agent.input.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/dtos/create-agent.input.ts
similarity index 81%
rename from packages/twenty-server/src/engine/metadata-modules/ai-agent/dtos/create-agent.input.ts
rename to packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/dtos/create-agent.input.ts
index f4f7754f9dd..fe14e66ad5c 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai-agent/dtos/create-agent.input.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/dtos/create-agent.input.ts
@@ -1,6 +1,7 @@
 import { Field, HideField, InputType } from '@nestjs/graphql';
 
 import {
+  IsArray,
   IsNotEmpty,
   IsObject,
   IsOptional,
@@ -10,8 +11,8 @@ import {
 import GraphQLJSON from 'graphql-type-json';
 
 import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
-import { ModelId } from 'src/engine/metadata-modules/ai-models/constants/ai-models.const';
-import { ModelConfiguration } from 'src/engine/metadata-modules/ai-agent/types/modelConfiguration';
+import { ModelConfiguration } from 'src/engine/metadata-modules/ai/ai-agent/types/modelConfiguration';
+import { ModelId } from 'src/engine/metadata-modules/ai/ai-models/constants/ai-models.const';
 
 @InputType()
 export class CreateAgentInput {
@@ -60,6 +61,12 @@ export class CreateAgentInput {
   @Field(() => GraphQLJSON, { nullable: true })
   modelConfiguration?: ModelConfiguration;
 
+  @IsArray()
+  @IsString({ each: true })
+  @IsOptional()
+  @Field(() => [String], { nullable: true })
+  evaluationInputs?: string[];
+
   @HideField()
   standardId?: string;
 
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai-agent/dtos/update-agent.input.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/dtos/update-agent.input.ts
similarity index 82%
rename from packages/twenty-server/src/engine/metadata-modules/ai-agent/dtos/update-agent.input.ts
rename to packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/dtos/update-agent.input.ts
index c3da1e9dc0d..3fc71540dee 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai-agent/dtos/update-agent.input.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/dtos/update-agent.input.ts
@@ -1,6 +1,7 @@
 import { Field, InputType } from '@nestjs/graphql';
 
 import {
+  IsArray,
   IsNotEmpty,
   IsObject,
   IsOptional,
@@ -10,8 +11,8 @@ import {
 import GraphQLJSON from 'graphql-type-json';
 
 import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
-import { ModelId } from 'src/engine/metadata-modules/ai-models/constants/ai-models.const';
-import { ModelConfiguration } from 'src/engine/metadata-modules/ai-agent/types/modelConfiguration';
+import { ModelConfiguration } from 'src/engine/metadata-modules/ai/ai-agent/types/modelConfiguration';
+import { ModelId } from 'src/engine/metadata-modules/ai/ai-models/constants/ai-models.const';
 
 @InputType()
 export class UpdateAgentInput {
@@ -64,4 +65,10 @@ export class UpdateAgentInput {
   @IsOptional()
   @Field(() => GraphQLJSON, { nullable: true })
   modelConfiguration?: ModelConfiguration;
+
+  @IsArray()
+  @IsString({ each: true })
+  @IsOptional()
+  @Field(() => [String], { nullable: true })
+  evaluationInputs?: string[];
 }
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai-agent/entities/agent.entity.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/entities/agent.entity.ts
similarity index 89%
rename from packages/twenty-server/src/engine/metadata-modules/ai-agent/entities/agent.entity.ts
rename to packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/entities/agent.entity.ts
index 62c3ebc8b5c..2752d66df5b 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai-agent/entities/agent.entity.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/entities/agent.entity.ts
@@ -13,13 +13,13 @@ import {
 import { Relation } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/relation.interface';
 import { SyncableEntity } from 'src/engine/workspace-manager/workspace-sync/interfaces/syncable-entity.interface';
 
-import {
-  ModelId,
-  DEFAULT_SMART_MODEL,
-} from 'src/engine/metadata-modules/ai-models/constants/ai-models.const';
 import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
-import { AgentResponseFormat } from 'src/engine/metadata-modules/ai-agent/types/agent-response-format.type';
-import { ModelConfiguration } from 'src/engine/metadata-modules/ai-agent/types/modelConfiguration';
+import { AgentResponseFormat } from 'src/engine/metadata-modules/ai/ai-agent/types/agent-response-format.type';
+import { ModelConfiguration } from 'src/engine/metadata-modules/ai/ai-agent/types/modelConfiguration';
+import {
+  DEFAULT_SMART_MODEL,
+  ModelId,
+} from 'src/engine/metadata-modules/ai/ai-models/constants/ai-models.const';
 
 @Entity('agent')
 @Index('IDX_AGENT_ID_DELETED_AT', ['id', 'deletedAt'])
@@ -81,4 +81,7 @@ export class AgentEntity
 
   @Column({ nullable: true, type: 'jsonb' })
   modelConfiguration: ModelConfiguration;
+
+  @Column({ type: 'text', array: true, default: '{}' })
+  evaluationInputs: string[];
 }
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai-agent/services/agent-actor-context.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/services/agent-actor-context.service.ts
similarity index 97%
rename from packages/twenty-server/src/engine/metadata-modules/ai-agent/services/agent-actor-context.service.ts
rename to packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/services/agent-actor-context.service.ts
index 43069864505..b56025b6a68 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai-agent/services/agent-actor-context.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/services/agent-actor-context.service.ts
@@ -7,7 +7,7 @@ import { UserWorkspaceService } from 'src/engine/core-modules/user-workspace/use
 import {
   AgentException,
   AgentExceptionCode,
-} from 'src/engine/metadata-modules/ai-agent/agent.exception';
+} from 'src/engine/metadata-modules/ai/ai-agent/agent.exception';
 import { UserRoleService } from 'src/engine/metadata-modules/user-role/user-role.service';
 import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.manager';
 
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai-agent/services/agent-execution.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/services/agent-execution.service.ts
similarity index 91%
rename from packages/twenty-server/src/engine/metadata-modules/ai-agent/services/agent-execution.service.ts
rename to packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/services/agent-execution.service.ts
index 97cdb47ce88..0c692c4ba20 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai-agent/services/agent-execution.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/services/agent-execution.service.ts
@@ -15,29 +15,28 @@ import { getAppPath } from 'twenty-shared/utils';
 import { In } from 'typeorm';
 
 import { getAllSelectableColumnNames } from 'src/engine/api/utils/get-all-selectable-column-names.utils';
-import { AI_TELEMETRY_CONFIG } from 'src/engine/metadata-modules/ai-models/constants/ai-telemetry.const';
-import { AIBillingService } from 'src/engine/metadata-modules/ai-billing/services/ai-billing.service';
-import { AiModelRegistryService } from 'src/engine/metadata-modules/ai-models/services/ai-model-registry.service';
 import { WorkspaceDomainsService } from 'src/engine/core-modules/domain/workspace-domains/services/workspace-domains.service';
 import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
-import { AgentService } from 'src/engine/metadata-modules/ai-agent/agent.service';
-import { AGENT_CONFIG } from 'src/engine/metadata-modules/ai-agent/constants/agent-config.const';
-import { AGENT_SYSTEM_PROMPTS } from 'src/engine/metadata-modules/ai-agent/constants/agent-system-prompts.const';
-import { AgentActorContextService } from 'src/engine/metadata-modules/ai-agent/services/agent-actor-context.service';
-import { type RecordIdsByObjectMetadataNameSingularType } from 'src/engine/metadata-modules/ai-agent/types/recordIdsByObjectMetadataNameSingular.type';
-import { type ToolHints } from 'src/engine/metadata-modules/ai-router/types/tool-hints.interface';
-import { getObjectMetadataMapItemByNameSingular } from 'src/engine/metadata-modules/utils/get-object-metadata-map-item-by-name-singular.util';
-import { WorkspacePermissionsCacheService } from 'src/engine/metadata-modules/workspace-permissions-cache/workspace-permissions-cache.service';
-import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.manager';
-import { AgentEntity } from 'src/engine/metadata-modules/ai-agent/entities/agent.entity';
 import {
   AgentException,
   AgentExceptionCode,
-} from 'src/engine/metadata-modules/ai-agent/agent.exception';
-import { repairToolCall } from 'src/engine/metadata-modules/ai-agent/utils/repair-tool-call.util';
-
-import { AgentToolGeneratorService } from './agent-tool-generator.service';
-import { AgentModelConfigService } from './agent-model-config.service';
+} from 'src/engine/metadata-modules/ai/ai-agent/agent.exception';
+import { AgentService } from 'src/engine/metadata-modules/ai/ai-agent/agent.service';
+import { AGENT_CONFIG } from 'src/engine/metadata-modules/ai/ai-agent/constants/agent-config.const';
+import { AGENT_SYSTEM_PROMPTS } from 'src/engine/metadata-modules/ai/ai-agent/constants/agent-system-prompts.const';
+import { AgentEntity } from 'src/engine/metadata-modules/ai/ai-agent/entities/agent.entity';
+import { AgentActorContextService } from 'src/engine/metadata-modules/ai/ai-agent/services/agent-actor-context.service';
+import { AgentModelConfigService } from 'src/engine/metadata-modules/ai/ai-agent/services/agent-model-config.service';
+import { AgentToolGeneratorService } from 'src/engine/metadata-modules/ai/ai-agent/services/agent-tool-generator.service';
+import { type RecordIdsByObjectMetadataNameSingularType } from 'src/engine/metadata-modules/ai/ai-agent/types/recordIdsByObjectMetadataNameSingular.type';
+import { repairToolCall } from 'src/engine/metadata-modules/ai/ai-agent/utils/repair-tool-call.util';
+import { AIBillingService } from 'src/engine/metadata-modules/ai/ai-billing/services/ai-billing.service';
+import { type ToolHints } from 'src/engine/metadata-modules/ai/ai-chat-router/types/tool-hints.interface';
+import { AI_TELEMETRY_CONFIG } from 'src/engine/metadata-modules/ai/ai-models/constants/ai-telemetry.const';
+import { AiModelRegistryService } from 'src/engine/metadata-modules/ai/ai-models/services/ai-model-registry.service';
+import { getObjectMetadataMapItemByNameSingular } from 'src/engine/metadata-modules/utils/get-object-metadata-map-item-by-name-singular.util';
+import { WorkspacePermissionsCacheService } from 'src/engine/metadata-modules/workspace-permissions-cache/workspace-permissions-cache.service';
+import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.manager';
 
 export interface AgentExecutionResult {
   result: object;
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai-agent/services/agent-model-config.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/services/agent-model-config.service.ts
similarity index 87%
rename from packages/twenty-server/src/engine/metadata-modules/ai-agent/services/agent-model-config.service.ts
rename to packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/services/agent-model-config.service.ts
index 09cd52f5b57..02f25af1e59 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai-agent/services/agent-model-config.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/services/agent-model-config.service.ts
@@ -5,10 +5,10 @@ import { openai } from '@ai-sdk/openai';
 import { ProviderOptions } from '@ai-sdk/provider-utils';
 import { ToolSet } from 'ai';
 
-import { ModelProvider } from 'src/engine/metadata-modules/ai-models/constants/ai-models.const';
-import { RegisteredAIModel } from 'src/engine/metadata-modules/ai-models/services/ai-model-registry.service';
-import { AGENT_CONFIG } from 'src/engine/metadata-modules/ai-agent/constants/agent-config.const';
-import { AgentEntity } from 'src/engine/metadata-modules/ai-agent/entities/agent.entity';
+import { AGENT_CONFIG } from 'src/engine/metadata-modules/ai/ai-agent/constants/agent-config.const';
+import { AgentEntity } from 'src/engine/metadata-modules/ai/ai-agent/entities/agent.entity';
+import { ModelProvider } from 'src/engine/metadata-modules/ai/ai-models/constants/ai-models.const';
+import { RegisteredAIModel } from 'src/engine/metadata-modules/ai/ai-models/services/ai-model-registry.service';
 
 @Injectable()
 export class AgentModelConfigService {
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai-agent/services/agent-plan-executor.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/services/agent-plan-executor.service.ts
similarity index 97%
rename from packages/twenty-server/src/engine/metadata-modules/ai-agent/services/agent-plan-executor.service.ts
rename to packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/services/agent-plan-executor.service.ts
index d514b6b8fa5..0cfb6547786 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai-agent/services/agent-plan-executor.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/services/agent-plan-executor.service.ts
@@ -1,8 +1,8 @@
 import { Injectable, Logger } from '@nestjs/common';
 
 import { type WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
-import { type RecordIdsByObjectMetadataNameSingularType } from 'src/engine/metadata-modules/ai-agent/types/recordIdsByObjectMetadataNameSingular.type';
-import { type PlanStep } from 'src/engine/metadata-modules/ai-router/types/router-result.interface';
+import { type RecordIdsByObjectMetadataNameSingularType } from 'src/engine/metadata-modules/ai/ai-agent/types/recordIdsByObjectMetadataNameSingular.type';
+import { type PlanStep } from 'src/engine/metadata-modules/ai/ai-chat-router/types/router-result.interface';
 import { standardAgentDefinitions } from 'src/engine/workspace-manager/workspace-sync-metadata/standard-agents';
 
 import { AgentExecutionService } from './agent-execution.service';
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai-agent/services/agent-title-generation.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/services/agent-title-generation.service.ts
similarity index 94%
rename from packages/twenty-server/src/engine/metadata-modules/ai-agent/services/agent-title-generation.service.ts
rename to packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/services/agent-title-generation.service.ts
index d5e7f369e1e..8fed08f1775 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai-agent/services/agent-title-generation.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/services/agent-title-generation.service.ts
@@ -2,8 +2,8 @@ import { Injectable, Logger } from '@nestjs/common';
 
 import { generateText } from 'ai';
 
-import { AI_TELEMETRY_CONFIG } from 'src/engine/metadata-modules/ai-models/constants/ai-telemetry.const';
-import { AiModelRegistryService } from 'src/engine/metadata-modules/ai-models/services/ai-model-registry.service';
+import { AI_TELEMETRY_CONFIG } from 'src/engine/metadata-modules/ai/ai-models/constants/ai-telemetry.const';
+import { AiModelRegistryService } from 'src/engine/metadata-modules/ai/ai-models/services/ai-model-registry.service';
 
 @Injectable()
 export class AgentTitleGenerationService {
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai-agent/services/agent-tool-generator.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/services/agent-tool-generator.service.ts
similarity index 94%
rename from packages/twenty-server/src/engine/metadata-modules/ai-agent/services/agent-tool-generator.service.ts
rename to packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/services/agent-tool-generator.service.ts
index 8d251fe3254..075f048bbab 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai-agent/services/agent-tool-generator.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/services/agent-tool-generator.service.ts
@@ -6,11 +6,11 @@ import { Repository } from 'typeorm';
 
 import type { ActorMetadata } from 'twenty-shared/types';
 
-import { ToolAdapterService } from 'src/engine/metadata-modules/ai-tools/services/tool-adapter.service';
-import { ToolService } from 'src/engine/metadata-modules/ai-tools/services/tool.service';
 import { SearchArticlesTool } from 'src/engine/core-modules/tool/tools/search-articles-tool/search-articles-tool';
-import { AgentEntity } from 'src/engine/metadata-modules/ai-agent/entities/agent.entity';
-import type { ToolHints } from 'src/engine/metadata-modules/ai-router/types/tool-hints.interface';
+import { AgentEntity } from 'src/engine/metadata-modules/ai/ai-agent/entities/agent.entity';
+import type { ToolHints } from 'src/engine/metadata-modules/ai/ai-chat-router/types/tool-hints.interface';
+import { ToolAdapterService } from 'src/engine/metadata-modules/ai/ai-tools/services/tool-adapter.service';
+import { ToolService } from 'src/engine/metadata-modules/ai/ai-tools/services/tool.service';
 import { PermissionFlagType } from 'src/engine/metadata-modules/permissions/constants/permission-flag-type.constants';
 import { PermissionsService } from 'src/engine/metadata-modules/permissions/permissions.service';
 import { HELPER_AGENT } from 'src/engine/workspace-manager/workspace-sync-metadata/standard-agents/agents/helper-agent';
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai-agent/types/agent-response-format.type.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/types/agent-response-format.type.ts
similarity index 100%
rename from packages/twenty-server/src/engine/metadata-modules/ai-agent/types/agent-response-format.type.ts
rename to packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/types/agent-response-format.type.ts
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai-agent/types/modelConfiguration.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/types/modelConfiguration.ts
similarity index 100%
rename from packages/twenty-server/src/engine/metadata-modules/ai-agent/types/modelConfiguration.ts
rename to packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/types/modelConfiguration.ts
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai-agent/types/recordIdsByObjectMetadataNameSingular.type.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/types/recordIdsByObjectMetadataNameSingular.type.ts
similarity index 100%
rename from packages/twenty-server/src/engine/metadata-modules/ai-agent/types/recordIdsByObjectMetadataNameSingular.type.ts
rename to packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/types/recordIdsByObjectMetadataNameSingular.type.ts
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai-agent/utils/__tests__/is-workflow-related-object.util.spec.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/utils/__tests__/is-workflow-related-object.util.spec.ts
similarity index 95%
rename from packages/twenty-server/src/engine/metadata-modules/ai-agent/utils/__tests__/is-workflow-related-object.util.spec.ts
rename to packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/utils/__tests__/is-workflow-related-object.util.spec.ts
index d06fc137106..8c0cc482658 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai-agent/utils/__tests__/is-workflow-related-object.util.spec.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/utils/__tests__/is-workflow-related-object.util.spec.ts
@@ -1,6 +1,6 @@
 import { STANDARD_OBJECT_IDS } from 'twenty-shared/metadata';
 
-import { isWorkflowRelatedObject } from 'src/engine/metadata-modules/ai-agent/utils/is-workflow-related-object.util';
+import { isWorkflowRelatedObject } from 'src/engine/metadata-modules/ai/ai-agent/utils/is-workflow-related-object.util';
 import { type ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
 
 describe('isWorkflowRelatedObject', () => {
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai-agent/utils/is-workflow-related-object.util.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/utils/is-workflow-related-object.util.ts
similarity index 100%
rename from packages/twenty-server/src/engine/metadata-modules/ai-agent/utils/is-workflow-related-object.util.ts
rename to packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/utils/is-workflow-related-object.util.ts
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai-agent/utils/is-workflow-run-object.util.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/utils/is-workflow-run-object.util.ts
similarity index 100%
rename from packages/twenty-server/src/engine/metadata-modules/ai-agent/utils/is-workflow-run-object.util.ts
rename to packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/utils/is-workflow-run-object.util.ts
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai-agent/utils/repair-tool-call.util.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/utils/repair-tool-call.util.ts
similarity index 97%
rename from packages/twenty-server/src/engine/metadata-modules/ai-agent/utils/repair-tool-call.util.ts
rename to packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/utils/repair-tool-call.util.ts
index 1c447786cf2..3d4f9ccb6ad 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai-agent/utils/repair-tool-call.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/utils/repair-tool-call.util.ts
@@ -1,7 +1,7 @@
 import { generateObject, type LanguageModel, NoSuchToolError } from 'ai';
 import { type z } from 'zod';
 
-import { AI_TELEMETRY_CONFIG } from 'src/engine/metadata-modules/ai-models/constants/ai-telemetry.const';
+import { AI_TELEMETRY_CONFIG } from 'src/engine/metadata-modules/ai/ai-models/constants/ai-telemetry.const';
 
 type ToolCall = {
   type: 'tool-call';
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai-billing/ai-billing.module.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-billing/ai-billing.module.ts
similarity index 74%
rename from packages/twenty-server/src/engine/metadata-modules/ai-billing/ai-billing.module.ts
rename to packages/twenty-server/src/engine/metadata-modules/ai/ai-billing/ai-billing.module.ts
index 9c9971f7967..102f6ede4b5 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai-billing/ai-billing.module.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-billing/ai-billing.module.ts
@@ -1,7 +1,7 @@
 import { Module } from '@nestjs/common';
 
-import { AIBillingService } from 'src/engine/metadata-modules/ai-billing/services/ai-billing.service';
-import { AiModelsModule } from 'src/engine/metadata-modules/ai-models/ai-models.module';
+import { AIBillingService } from 'src/engine/metadata-modules/ai/ai-billing/services/ai-billing.service';
+import { AiModelsModule } from 'src/engine/metadata-modules/ai/ai-models/ai-models.module';
 import { WorkspaceEventEmitterModule } from 'src/engine/workspace-event-emitter/workspace-event-emitter.module';
 
 @Module({
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai-billing/constants/dollar-to-credit-multiplier.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-billing/constants/dollar-to-credit-multiplier.ts
similarity index 100%
rename from packages/twenty-server/src/engine/metadata-modules/ai-billing/constants/dollar-to-credit-multiplier.ts
rename to packages/twenty-server/src/engine/metadata-modules/ai/ai-billing/constants/dollar-to-credit-multiplier.ts
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai-billing/services/__tests__/ai-billing.service.spec.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-billing/services/__tests__/ai-billing.service.spec.ts
similarity index 97%
rename from packages/twenty-server/src/engine/metadata-modules/ai-billing/services/__tests__/ai-billing.service.spec.ts
rename to packages/twenty-server/src/engine/metadata-modules/ai/ai-billing/services/__tests__/ai-billing.service.spec.ts
index ef2f8150ed5..d40893958bc 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai-billing/services/__tests__/ai-billing.service.spec.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-billing/services/__tests__/ai-billing.service.spec.ts
@@ -2,9 +2,9 @@ import { Test, type TestingModule } from '@nestjs/testing';
 
 import { BILLING_FEATURE_USED } from 'src/engine/core-modules/billing/constants/billing-feature-used.constant';
 import { BillingMeterEventName } from 'src/engine/core-modules/billing/enums/billing-meter-event-names';
+import { AIBillingService } from 'src/engine/metadata-modules/ai/ai-billing/services/ai-billing.service';
+import { AiModelRegistryService } from 'src/engine/metadata-modules/ai/ai-models/services/ai-model-registry.service';
 import { WorkspaceEventEmitter } from 'src/engine/workspace-event-emitter/workspace-event-emitter';
-import { AIBillingService } from 'src/engine/metadata-modules/ai-billing/services/ai-billing.service';
-import { AiModelRegistryService } from 'src/engine/metadata-modules/ai-models/services/ai-model-registry.service';
 
 describe('AIBillingService', () => {
   let service: AIBillingService;
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai-billing/services/ai-billing.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-billing/services/ai-billing.service.ts
similarity index 91%
rename from packages/twenty-server/src/engine/metadata-modules/ai-billing/services/ai-billing.service.ts
rename to packages/twenty-server/src/engine/metadata-modules/ai/ai-billing/services/ai-billing.service.ts
index c69a7fecab5..adea4a1bb67 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai-billing/services/ai-billing.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-billing/services/ai-billing.service.ts
@@ -2,12 +2,12 @@ import { Injectable, Logger } from '@nestjs/common';
 
 import { LanguageModelUsage } from 'ai';
 
-import { type ModelId } from 'src/engine/metadata-modules/ai-models/constants/ai-models.const';
-import { AiModelRegistryService } from 'src/engine/metadata-modules/ai-models/services/ai-model-registry.service';
-import { convertCentsToBillingCredits } from 'src/engine/metadata-modules/ai-billing/utils/convert-cents-to-billing-credits.util';
 import { BILLING_FEATURE_USED } from 'src/engine/core-modules/billing/constants/billing-feature-used.constant';
 import { BillingMeterEventName } from 'src/engine/core-modules/billing/enums/billing-meter-event-names';
 import { type BillingUsageEvent } from 'src/engine/core-modules/billing/types/billing-usage-event.type';
+import { convertCentsToBillingCredits } from 'src/engine/metadata-modules/ai/ai-billing/utils/convert-cents-to-billing-credits.util';
+import { type ModelId } from 'src/engine/metadata-modules/ai/ai-models/constants/ai-models.const';
+import { AiModelRegistryService } from 'src/engine/metadata-modules/ai/ai-models/services/ai-model-registry.service';
 import { WorkspaceEventEmitter } from 'src/engine/workspace-event-emitter/workspace-event-emitter';
 
 @Injectable()
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai-billing/utils/convert-cents-to-billing-credits.util.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-billing/utils/convert-cents-to-billing-credits.util.ts
similarity index 87%
rename from packages/twenty-server/src/engine/metadata-modules/ai-billing/utils/convert-cents-to-billing-credits.util.ts
rename to packages/twenty-server/src/engine/metadata-modules/ai/ai-billing/utils/convert-cents-to-billing-credits.util.ts
index aaac5ac76f3..05746d4753c 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai-billing/utils/convert-cents-to-billing-credits.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-billing/utils/convert-cents-to-billing-credits.util.ts
@@ -1,4 +1,4 @@
-import { DOLLAR_TO_CREDIT_MULTIPLIER } from 'src/engine/metadata-modules/ai-billing/constants/dollar-to-credit-multiplier';
+import { DOLLAR_TO_CREDIT_MULTIPLIER } from 'src/engine/metadata-modules/ai/ai-billing/constants/dollar-to-credit-multiplier';
 
 // Converts cost in cents to cost in credits
 // Formula: credits = (cents / 100) * DOLLAR_TO_CREDIT_MULTIPLIER
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat-router/ai-chat-router.module.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat-router/ai-chat-router.module.ts
new file mode 100644
index 00000000000..5bab3a8ee9f
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat-router/ai-chat-router.module.ts
@@ -0,0 +1,29 @@
+import { Module } from '@nestjs/common';
+import { TypeOrmModule } from '@nestjs/typeorm';
+
+import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
+import { AgentEntity } from 'src/engine/metadata-modules/ai/ai-agent/entities/agent.entity';
+import { AiModelsModule } from 'src/engine/metadata-modules/ai/ai-models/ai-models.module';
+import { AiToolsModule } from 'src/engine/metadata-modules/ai/ai-tools/ai-tools.module';
+import { ObjectMetadataModule } from 'src/engine/metadata-modules/object-metadata/object-metadata.module';
+
+import { AiChatRouterService } from './ai-chat-router.service';
+
+import { AiChatRouterPlanGeneratorService } from './services/ai-chat-router-plan-generator.service';
+import { AiChatRouterStrategyDeciderService } from './services/ai-chat-router-strategy-decider.service';
+
+@Module({
+  imports: [
+    TypeOrmModule.forFeature([AgentEntity, WorkspaceEntity]),
+    AiModelsModule,
+    AiToolsModule,
+    ObjectMetadataModule,
+  ],
+  providers: [
+    AiChatRouterService,
+    AiChatRouterStrategyDeciderService,
+    AiChatRouterPlanGeneratorService,
+  ],
+  exports: [AiChatRouterService],
+})
+export class AiChatRouterModule {}
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai-router/ai-router.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat-router/ai-chat-router.service.ts
similarity index 92%
rename from packages/twenty-server/src/engine/metadata-modules/ai-router/ai-router.service.ts
rename to packages/twenty-server/src/engine/metadata-modules/ai/ai-chat-router/ai-chat-router.service.ts
index 12738a18c22..5b2296de9aa 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai-router/ai-router.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat-router/ai-chat-router.service.ts
@@ -4,24 +4,24 @@ import { InjectRepository } from '@nestjs/typeorm';
 import { type UIDataTypes, type UIMessage, type UITools } from 'ai';
 import { IsNull, type Repository } from 'typeorm';
 
-import { type ModelId } from 'src/engine/metadata-modules/ai-models/constants/ai-models.const';
-import { AgentEntity } from 'src/engine/metadata-modules/ai-agent/entities/agent.entity';
-import { isWorkflowRelatedObject } from 'src/engine/metadata-modules/ai-agent/utils/is-workflow-related-object.util';
+import { AgentEntity } from 'src/engine/metadata-modules/ai/ai-agent/entities/agent.entity';
+import { isWorkflowRelatedObject } from 'src/engine/metadata-modules/ai/ai-agent/utils/is-workflow-related-object.util';
+import { type ModelId } from 'src/engine/metadata-modules/ai/ai-models/constants/ai-models.const';
 import { ObjectMetadataServiceV2 } from 'src/engine/metadata-modules/object-metadata/object-metadata-v2.service';
 import { HELPER_AGENT } from 'src/engine/workspace-manager/workspace-sync-metadata/standard-agents/agents/helper-agent';
 
-import { AiRouterPlanGeneratorService } from './services/ai-router-plan-generator.service';
+import { AiChatRouterPlanGeneratorService } from './services/ai-chat-router-plan-generator.service';
 import {
-  AiRouterStrategyDeciderService,
+  AiChatRouterStrategyDeciderService,
   type StrategyDecision,
-} from './services/ai-router-strategy-decider.service';
+} from './services/ai-chat-router-strategy-decider.service';
 import {
   type RouterDebugInfo,
   type UnifiedRouterResult,
 } from './types/router-result.interface';
 import { type ToolHints } from './types/tool-hints.interface';
 
-export interface AiRouterContext {
+export interface AiChatRouterContext {
   messages: UIMessage<unknown, UIDataTypes, UITools>[];
   workspaceId: string;
   fastModel: ModelId;
@@ -29,19 +29,19 @@ export interface AiRouterContext {
 }
 
 @Injectable()
-export class AiRouterService {
-  private readonly logger = new Logger(AiRouterService.name);
+export class AiChatRouterService {
+  private readonly logger = new Logger(AiChatRouterService.name);
 
   constructor(
     @InjectRepository(AgentEntity)
     private readonly agentRepository: Repository<AgentEntity>,
-    private readonly strategyDecider: AiRouterStrategyDeciderService,
-    private readonly planGenerator: AiRouterPlanGeneratorService,
+    private readonly strategyDecider: AiChatRouterStrategyDeciderService,
+    private readonly planGenerator: AiChatRouterPlanGeneratorService,
     private readonly objectMetadataService: ObjectMetadataServiceV2,
   ) {}
 
   async routeMessage(
-    context: AiRouterContext,
+    context: AiChatRouterContext,
     includeDebugInfo = false,
   ): Promise<UnifiedRouterResult> {
     try {
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai-router/services/ai-router-plan-generator.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat-router/services/ai-chat-router-plan-generator.service.ts
similarity index 93%
rename from packages/twenty-server/src/engine/metadata-modules/ai-router/services/ai-router-plan-generator.service.ts
rename to packages/twenty-server/src/engine/metadata-modules/ai/ai-chat-router/services/ai-chat-router-plan-generator.service.ts
index 6974f85f254..612a22042dc 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai-router/services/ai-router-plan-generator.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat-router/services/ai-chat-router-plan-generator.service.ts
@@ -8,18 +8,18 @@ import {
 } from 'ai';
 import { z } from 'zod';
 
+import { type AgentEntity } from 'src/engine/metadata-modules/ai/ai-agent/entities/agent.entity';
+import { type ExecutionPlan } from 'src/engine/metadata-modules/ai/ai-chat-router/types/router-result.interface';
 import {
   DEFAULT_SMART_MODEL,
   type ModelId,
-} from 'src/engine/metadata-modules/ai-models/constants/ai-models.const';
-import { AI_TELEMETRY_CONFIG } from 'src/engine/metadata-modules/ai-models/constants/ai-telemetry.const';
-import { AiModelRegistryService } from 'src/engine/metadata-modules/ai-models/services/ai-model-registry.service';
-import { type AgentEntity } from 'src/engine/metadata-modules/ai-agent/entities/agent.entity';
-import { type ExecutionPlan } from 'src/engine/metadata-modules/ai-router/types/router-result.interface';
+} from 'src/engine/metadata-modules/ai/ai-models/constants/ai-models.const';
+import { AI_TELEMETRY_CONFIG } from 'src/engine/metadata-modules/ai/ai-models/constants/ai-telemetry.const';
+import { AiModelRegistryService } from 'src/engine/metadata-modules/ai/ai-models/services/ai-model-registry.service';
 
 @Injectable()
-export class AiRouterPlanGeneratorService {
-  private readonly logger = new Logger(AiRouterPlanGeneratorService.name);
+export class AiChatRouterPlanGeneratorService {
+  private readonly logger = new Logger(AiChatRouterPlanGeneratorService.name);
 
   constructor(
     private readonly aiModelRegistryService: AiModelRegistryService,
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai-router/services/ai-router-strategy-decider.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat-router/services/ai-chat-router-strategy-decider.service.ts
similarity index 92%
rename from packages/twenty-server/src/engine/metadata-modules/ai-router/services/ai-router-strategy-decider.service.ts
rename to packages/twenty-server/src/engine/metadata-modules/ai/ai-chat-router/services/ai-chat-router-strategy-decider.service.ts
index c2598250e9b..63a4d5a26f7 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai-router/services/ai-router-strategy-decider.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat-router/services/ai-chat-router-strategy-decider.service.ts
@@ -9,14 +9,14 @@ import {
 } from 'ai';
 import { z } from 'zod';
 
+import { AGENT_SYSTEM_PROMPTS } from 'src/engine/metadata-modules/ai/ai-agent/constants/agent-system-prompts.const';
+import { type AgentEntity } from 'src/engine/metadata-modules/ai/ai-agent/entities/agent.entity';
 import {
   DEFAULT_FAST_MODEL,
   type ModelId,
-} from 'src/engine/metadata-modules/ai-models/constants/ai-models.const';
-import { AI_TELEMETRY_CONFIG } from 'src/engine/metadata-modules/ai-models/constants/ai-telemetry.const';
-import { AiModelRegistryService } from 'src/engine/metadata-modules/ai-models/services/ai-model-registry.service';
-import { type AgentEntity } from 'src/engine/metadata-modules/ai-agent/entities/agent.entity';
-import { AGENT_SYSTEM_PROMPTS } from 'src/engine/metadata-modules/ai-agent/constants/agent-system-prompts.const';
+} from 'src/engine/metadata-modules/ai/ai-models/constants/ai-models.const';
+import { AI_TELEMETRY_CONFIG } from 'src/engine/metadata-modules/ai/ai-models/constants/ai-telemetry.const';
+import { AiModelRegistryService } from 'src/engine/metadata-modules/ai/ai-models/services/ai-model-registry.service';
 
 export type StrategyDecision = {
   strategy: 'simple' | 'planned';
@@ -28,8 +28,8 @@ export type StrategyDecision = {
 };
 
 @Injectable()
-export class AiRouterStrategyDeciderService {
-  private readonly logger = new Logger(AiRouterStrategyDeciderService.name);
+export class AiChatRouterStrategyDeciderService {
+  private readonly logger = new Logger(AiChatRouterStrategyDeciderService.name);
 
   constructor(
     private readonly aiModelRegistryService: AiModelRegistryService,
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai-router/types/router-result.interface.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat-router/types/router-result.interface.ts
similarity index 96%
rename from packages/twenty-server/src/engine/metadata-modules/ai-router/types/router-result.interface.ts
rename to packages/twenty-server/src/engine/metadata-modules/ai/ai-chat-router/types/router-result.interface.ts
index 56c8777f06d..898943391be 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai-router/types/router-result.interface.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat-router/types/router-result.interface.ts
@@ -1,4 +1,4 @@
-import { type AgentEntity } from 'src/engine/metadata-modules/ai-agent/entities/agent.entity';
+import { type AgentEntity } from 'src/engine/metadata-modules/ai/ai-agent/entities/agent.entity';
 
 import { type ToolHints } from './tool-hints.interface';
 
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai-router/types/tool-hints.interface.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat-router/types/tool-hints.interface.ts
similarity index 100%
rename from packages/twenty-server/src/engine/metadata-modules/ai-router/types/tool-hints.interface.ts
rename to packages/twenty-server/src/engine/metadata-modules/ai/ai-chat-router/types/tool-hints.interface.ts
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai-chat/ai-chat.module.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/ai-chat.module.ts
similarity index 67%
rename from packages/twenty-server/src/engine/metadata-modules/ai-chat/ai-chat.module.ts
rename to packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/ai-chat.module.ts
index 923b922f33b..ba3c4906ac4 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai-chat/ai-chat.module.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/ai-chat.module.ts
@@ -9,35 +9,31 @@ import { FileModule } from 'src/engine/core-modules/file/file.module';
 import { ThrottlerModule } from 'src/engine/core-modules/throttler/throttler.module';
 import { UserWorkspaceEntity } from 'src/engine/core-modules/user-workspace/user-workspace.entity';
 import { UserWorkspaceModule } from 'src/engine/core-modules/user-workspace/user-workspace.module';
-import { AiAgentModule } from 'src/engine/metadata-modules/ai-agent/ai-agent.module';
-import { AiBillingModule } from 'src/engine/metadata-modules/ai-billing/ai-billing.module';
-import { AiModelsModule } from 'src/engine/metadata-modules/ai-models/ai-models.module';
-import { AiRouterModule } from 'src/engine/metadata-modules/ai-router/ai-router.module';
+import { AiAgentExecutionModule } from 'src/engine/metadata-modules/ai/ai-agent-execution/ai-agent-execution.module';
+import { AiAgentModule } from 'src/engine/metadata-modules/ai/ai-agent/ai-agent.module';
+import { AiBillingModule } from 'src/engine/metadata-modules/ai/ai-billing/ai-billing.module';
+import { AiChatRouterModule } from 'src/engine/metadata-modules/ai/ai-chat-router/ai-chat-router.module';
 import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';
 import { WorkspacePermissionsCacheModule } from 'src/engine/metadata-modules/workspace-permissions-cache/workspace-permissions-cache.module';
 import { WorkspaceCacheStorageModule } from 'src/engine/workspace-cache-storage/workspace-cache-storage.module';
 
 import { AgentChatController } from './controllers/agent-chat.controller';
-import { AgentChatMessagePartEntity } from './entities/agent-chat-message-part.entity';
-import { AgentChatMessageEntity } from './entities/agent-chat-message.entity';
 import { AgentChatThreadEntity } from './entities/agent-chat-thread.entity';
 import { AgentChatResolver } from './resolvers/agent-chat.resolver';
+import { AgentChatRoutingService } from './services/agent-chat-routing.service';
+import { AgentChatStreamingService } from './services/agent-chat-streaming.service';
 import { AgentChatService } from './services/agent-chat.service';
-import { AgentStreamingService } from './services/agent-streaming.service';
 
 @Module({
   imports: [
     TypeOrmModule.forFeature([
-      AgentChatMessageEntity,
-      AgentChatMessagePartEntity,
       AgentChatThreadEntity,
       FileEntity,
       UserWorkspaceEntity,
     ]),
-    AiModelsModule,
-    AiBillingModule,
-    AiRouterModule,
     AiAgentModule,
+    AiAgentExecutionModule,
+    AiChatRouterModule,
     ThrottlerModule,
     FeatureFlagModule,
     FileUploadModule,
@@ -47,17 +43,19 @@ import { AgentStreamingService } from './services/agent-streaming.service';
     WorkspaceCacheStorageModule,
     TokenModule,
     UserWorkspaceModule,
+    AiBillingModule,
   ],
   controllers: [AgentChatController],
-  providers: [AgentChatResolver, AgentChatService, AgentStreamingService],
+  providers: [
+    AgentChatResolver,
+    AgentChatService,
+    AgentChatStreamingService,
+    AgentChatRoutingService,
+  ],
   exports: [
     AgentChatService,
-    AgentStreamingService,
-    TypeOrmModule.forFeature([
-      AgentChatMessageEntity,
-      AgentChatMessagePartEntity,
-      AgentChatThreadEntity,
-    ]),
+    AgentChatStreamingService,
+    TypeOrmModule.forFeature([AgentChatThreadEntity]),
   ],
 })
 export class AiChatModule {}
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai-chat/controllers/agent-chat.controller.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/controllers/agent-chat.controller.ts
similarity index 76%
rename from packages/twenty-server/src/engine/metadata-modules/ai-chat/controllers/agent-chat.controller.ts
rename to packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/controllers/agent-chat.controller.ts
index 25bc8fb3bac..7dd807c472b 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai-chat/controllers/agent-chat.controller.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/controllers/agent-chat.controller.ts
@@ -7,8 +7,8 @@ import {
   UseGuards,
 } from '@nestjs/common';
 
-import { UIDataTypes, UIMessage, UITools } from 'ai';
 import { Response } from 'express';
+import { type ExtendedUIMessage } from 'twenty-shared/ai';
 
 import { RestApiExceptionFilter } from 'src/engine/api/rest/rest-api-exception.filter';
 import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
@@ -17,18 +17,16 @@ import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorat
 import { JwtAuthGuard } from 'src/engine/guards/jwt-auth.guard';
 import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';
 import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
-import { type RecordIdsByObjectMetadataNameSingularType } from 'src/engine/metadata-modules/ai-agent/types/recordIdsByObjectMetadataNameSingular.type';
+import { type RecordIdsByObjectMetadataNameSingularType } from 'src/engine/metadata-modules/ai/ai-agent/types/recordIdsByObjectMetadataNameSingular.type';
+import { AgentChatStreamingService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-chat-streaming.service';
 import { PermissionFlagType } from 'src/engine/metadata-modules/permissions/constants/permission-flag-type.constants';
-import { AgentChatService } from 'src/engine/metadata-modules/ai-chat/services/agent-chat.service';
-import { AgentStreamingService } from 'src/engine/metadata-modules/ai-chat/services/agent-streaming.service';
 
 @Controller('rest/agent-chat')
 @UseGuards(JwtAuthGuard, WorkspaceAuthGuard)
 @UseFilters(RestApiExceptionFilter)
 export class AgentChatController {
   constructor(
-    private readonly agentChatService: AgentChatService,
-    private readonly agentStreamingService: AgentStreamingService,
+    private readonly agentStreamingService: AgentChatStreamingService,
   ) {}
 
   @Post('stream')
@@ -37,7 +35,7 @@ export class AgentChatController {
     @Body()
     body: {
       threadId: string;
-      messages: UIMessage<unknown, UIDataTypes, UITools>[];
+      messages: ExtendedUIMessage[];
       recordIdsByObjectMetadataNameSingular?: RecordIdsByObjectMetadataNameSingularType;
     },
     @AuthUserWorkspaceId() userWorkspaceId: string,
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai-chat/dtos/agent-chat-thread.dto.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/dtos/agent-chat-thread.dto.ts
similarity index 100%
rename from packages/twenty-server/src/engine/metadata-modules/ai-chat/dtos/agent-chat-thread.dto.ts
rename to packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/dtos/agent-chat-thread.dto.ts
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai-chat/entities/agent-chat-thread.entity.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/entities/agent-chat-thread.entity.ts
similarity index 66%
rename from packages/twenty-server/src/engine/metadata-modules/ai-chat/entities/agent-chat-thread.entity.ts
rename to packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/entities/agent-chat-thread.entity.ts
index d5fd2d451ed..63dc2318e8a 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai-chat/entities/agent-chat-thread.entity.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/entities/agent-chat-thread.entity.ts
@@ -13,7 +13,8 @@ import {
 import { Relation } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/relation.interface';
 
 import { UserWorkspaceEntity } from 'src/engine/core-modules/user-workspace/user-workspace.entity';
-import { AgentChatMessageEntity } from 'src/engine/metadata-modules/ai-chat/entities/agent-chat-message.entity';
+import { AgentMessageEntity } from 'src/engine/metadata-modules/ai/ai-agent-execution/entities/agent-message.entity';
+import { AgentTurnEntity } from 'src/engine/metadata-modules/ai/ai-agent-execution/entities/agent-turn.entity';
 
 @Entity('agentChatThread')
 export class AgentChatThreadEntity {
@@ -33,8 +34,11 @@ export class AgentChatThreadEntity {
   @Column({ nullable: true, type: 'varchar' })
   title: string;
 
-  @OneToMany(() => AgentChatMessageEntity, (message) => message.thread)
-  messages: Relation<AgentChatMessageEntity[]>;
+  @OneToMany(() => AgentTurnEntity, (turn) => turn.thread)
+  turns: Relation<AgentTurnEntity[]>;
+
+  @OneToMany(() => AgentMessageEntity, (message) => message.thread)
+  messages: Relation<AgentMessageEntity[]>;
 
   @CreateDateColumn()
   createdAt: Date;
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai-chat/resolvers/agent-chat.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/resolvers/agent-chat.resolver.ts
similarity index 90%
rename from packages/twenty-server/src/engine/metadata-modules/ai-chat/resolvers/agent-chat.resolver.ts
rename to packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/resolvers/agent-chat.resolver.ts
index df31d19f279..57150b5d2db 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai-chat/resolvers/agent-chat.resolver.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/resolvers/agent-chat.resolver.ts
@@ -10,10 +10,10 @@ import {
 } from 'src/engine/guards/feature-flag.guard';
 import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';
 import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
-import { AgentChatService } from 'src/engine/metadata-modules/ai-chat/services/agent-chat.service';
+import { AgentMessageDTO } from 'src/engine/metadata-modules/ai/ai-agent-execution/dtos/agent-message.dto';
+import { AgentChatThreadDTO } from 'src/engine/metadata-modules/ai/ai-chat/dtos/agent-chat-thread.dto';
+import { AgentChatService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-chat.service';
 import { PermissionFlagType } from 'src/engine/metadata-modules/permissions/constants/permission-flag-type.constants';
-import { AgentChatMessageDTO } from 'src/engine/metadata-modules/ai-chat/dtos/agent-chat-message.dto';
-import { AgentChatThreadDTO } from 'src/engine/metadata-modules/ai-chat/dtos/agent-chat-thread.dto';
 
 @UseGuards(
   WorkspaceAuthGuard,
@@ -39,7 +39,7 @@ export class AgentChatResolver {
     return this.agentChatService.getThreadById(id, userWorkspaceId);
   }
 
-  @Query(() => [AgentChatMessageDTO])
+  @Query(() => [AgentMessageDTO])
   @RequireFeatureFlag(FeatureFlagKey.IS_AI_ENABLED)
   async chatMessages(
     @Args('threadId', { type: () => UUIDScalarType }) threadId: string,
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai-chat/services/agent-streaming.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-routing.service.ts
similarity index 81%
rename from packages/twenty-server/src/engine/metadata-modules/ai-chat/services/agent-streaming.service.ts
rename to packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-routing.service.ts
index 5de698c958c..ea20b1b392f 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai-chat/services/agent-streaming.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-routing.service.ts
@@ -1,32 +1,18 @@
 import { Injectable, Logger } from '@nestjs/common';
-import { InjectRepository } from '@nestjs/typeorm';
 
-import {
-  createUIMessageStream,
-  pipeUIMessageStreamToResponse,
-  type UIDataTypes,
-  type UIMessage,
-  type UITools,
-} from 'ai';
+import { createUIMessageStream, pipeUIMessageStreamToResponse } from 'ai';
 import { type Response } from 'express';
 import { type ExtendedUIMessage } from 'twenty-shared/ai';
-import { type Repository } from 'typeorm';
 
-import { type ModelId } from 'src/engine/metadata-modules/ai-models/constants/ai-models.const';
-import { AIBillingService } from 'src/engine/metadata-modules/ai-billing/services/ai-billing.service';
-import { convertCentsToBillingCredits } from 'src/engine/metadata-modules/ai-billing/utils/convert-cents-to-billing-credits.util';
 import { type WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
-import { AgentChatMessageRole } from 'src/engine/metadata-modules/ai-chat/entities/agent-chat-message.entity';
-import { AgentChatThreadEntity } from 'src/engine/metadata-modules/ai-chat/entities/agent-chat-thread.entity';
-import { AgentChatService } from 'src/engine/metadata-modules/ai-chat/services/agent-chat.service';
-import { AgentExecutionService } from 'src/engine/metadata-modules/ai-agent/services/agent-execution.service';
-import {
-  AgentException,
-  AgentExceptionCode,
-} from 'src/engine/metadata-modules/ai-agent/agent.exception';
-import { AgentPlanExecutorService } from 'src/engine/metadata-modules/ai-agent/services/agent-plan-executor.service';
-import { type RecordIdsByObjectMetadataNameSingularType } from 'src/engine/metadata-modules/ai-agent/types/recordIdsByObjectMetadataNameSingular.type';
-import { AiRouterService } from 'src/engine/metadata-modules/ai-router/ai-router.service';
+import { AgentMessageRole } from 'src/engine/metadata-modules/ai/ai-agent-execution/entities/agent-message.entity';
+import { AgentExecutionService } from 'src/engine/metadata-modules/ai/ai-agent/services/agent-execution.service';
+import { AgentPlanExecutorService } from 'src/engine/metadata-modules/ai/ai-agent/services/agent-plan-executor.service';
+import { type RecordIdsByObjectMetadataNameSingularType } from 'src/engine/metadata-modules/ai/ai-agent/types/recordIdsByObjectMetadataNameSingular.type';
+import { AIBillingService } from 'src/engine/metadata-modules/ai/ai-billing/services/ai-billing.service';
+import { convertCentsToBillingCredits } from 'src/engine/metadata-modules/ai/ai-billing/utils/convert-cents-to-billing-credits.util';
+import { AiChatRouterService } from 'src/engine/metadata-modules/ai/ai-chat-router/ai-chat-router.service';
+import { type ModelId } from 'src/engine/metadata-modules/ai/ai-models/constants/ai-models.const';
 
 export type TokenUsage = {
   promptTokens: number;
@@ -34,53 +20,50 @@ export type TokenUsage = {
   totalTokens: number;
 };
 
-export type StreamAgentChatOptions = {
-  threadId: string;
+export type MessagePersistenceCallbacks = {
+  saveSystemMessage?: (message: Omit<ExtendedUIMessage, 'id'>) => Promise<{
+    turnId: string;
+  }>;
+  saveUserMessage: (
+    message: Omit<ExtendedUIMessage, 'id'>,
+    turnId?: string,
+  ) => Promise<{ turnId: string }>;
+  saveAssistantMessage: (
+    message: Omit<ExtendedUIMessage, 'id'>,
+    turnId: string,
+    agentId: string,
+  ) => Promise<void>;
+};
+
+export type StreamAgentExecutionOptions = {
   userWorkspaceId: string;
   workspace: WorkspaceEntity;
   recordIdsByObjectMetadataNameSingular: RecordIdsByObjectMetadataNameSingularType;
   response: Response;
-  messages: UIMessage<unknown, UIDataTypes, UITools>[];
+  messages: ExtendedUIMessage[];
+  persistenceCallbacks: MessagePersistenceCallbacks;
 };
 
 @Injectable()
-export class AgentStreamingService {
-  private readonly logger = new Logger(AgentStreamingService.name);
+export class AgentChatRoutingService {
+  private readonly logger = new Logger(AgentChatRoutingService.name);
 
   constructor(
-    @InjectRepository(AgentChatThreadEntity)
-    private readonly threadRepository: Repository<AgentChatThreadEntity>,
-    private readonly agentChatService: AgentChatService,
     private readonly agentExecutionService: AgentExecutionService,
     private readonly agentPlanExecutorService: AgentPlanExecutorService,
-    private readonly aiRouterService: AiRouterService,
+    private readonly aiChatRouterService: AiChatRouterService,
     private readonly aiBillingService: AIBillingService,
   ) {}
 
-  async streamAgentChat({
-    threadId,
+  async streamAgentExecution({
     userWorkspaceId,
     workspace,
     messages,
     recordIdsByObjectMetadataNameSingular,
     response,
-  }: StreamAgentChatOptions) {
+    persistenceCallbacks,
+  }: StreamAgentExecutionOptions) {
     try {
-      const thread = await this.threadRepository.findOne({
-        where: {
-          id: threadId,
-          userWorkspaceId,
-        },
-        relations: ['messages'],
-      });
-
-      if (!thread) {
-        throw new AgentException(
-          'Thread not found',
-          AgentExceptionCode.AGENT_EXECUTION_FAILED,
-        );
-      }
-
       const stream = createUIMessageStream<ExtendedUIMessage>({
         execute: async ({ writer }) => {
           const startTime = Date.now();
@@ -96,7 +79,7 @@ export class AgentStreamingService {
 
           const routingStart = Date.now();
           const includeDebugInfo = true;
-          const routeResult = await this.aiRouterService.routeMessage(
+          const routeResult = await this.aiChatRouterService.routeMessage(
             {
               messages,
               workspaceId: workspace.id,
@@ -199,10 +182,22 @@ export class AgentStreamingService {
               },
             });
 
-            await this.agentChatService.addMessage({
-              threadId,
-              uiMessage: {
-                role: AgentChatMessageRole.USER,
+            const systemMessage = messages.find((msg) => msg.role === 'system');
+            let turnId: string | undefined;
+
+            if (systemMessage && persistenceCallbacks.saveSystemMessage) {
+              const savedSystemMessage =
+                await persistenceCallbacks.saveSystemMessage({
+                  role: AgentMessageRole.SYSTEM,
+                  parts: systemMessage.parts,
+                });
+
+              turnId = savedSystemMessage.turnId;
+            }
+
+            const userMessage = await persistenceCallbacks.saveUserMessage(
+              {
+                role: AgentMessageRole.USER,
                 parts: [
                   {
                     type: 'text',
@@ -213,12 +208,12 @@ export class AgentStreamingService {
                   },
                 ],
               },
-            });
+              turnId,
+            );
 
-            await this.agentChatService.addMessage({
-              threadId,
-              uiMessage: {
-                role: AgentChatMessageRole.ASSISTANT,
+            await persistenceCallbacks.saveAssistantMessage(
+              {
+                role: AgentMessageRole.ASSISTANT,
                 parts: [
                   {
                     type: 'text',
@@ -226,7 +221,9 @@ export class AgentStreamingService {
                   },
                 ],
               },
-            });
+              userMessage.turnId,
+              '',
+            );
 
             return;
           }
@@ -353,10 +350,9 @@ export class AgentStreamingService {
 
                 writer.write(updatedRoutedStatusPart);
 
-                await this.agentChatService.addMessage({
-                  threadId,
-                  uiMessage: {
-                    role: AgentChatMessageRole.USER,
+                const userMessage = await persistenceCallbacks.saveUserMessage(
+                  {
+                    role: AgentMessageRole.USER,
                     parts: [
                       {
                         type: 'text',
@@ -367,15 +363,17 @@ export class AgentStreamingService {
                       },
                     ],
                   },
-                });
+                  undefined,
+                );
 
-                await this.agentChatService.addMessage({
-                  threadId,
-                  uiMessage: {
+                await persistenceCallbacks.saveAssistantMessage(
+                  {
                     ...responseMessage,
                     parts: [updatedRoutedStatusPart, ...responseMessage.parts],
                   },
-                });
+                  userMessage.turnId,
+                  agent.id,
+                );
               },
               sendReasoning: true,
             }),
@@ -386,7 +384,7 @@ export class AgentStreamingService {
       pipeUIMessageStreamToResponse({ stream, response });
     } catch (error) {
       this.logger.error(
-        'Failed to stream agent chat:',
+        'Failed to stream agent execution:',
         error instanceof Error ? error.message : String(error),
       );
       response.end();
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-streaming.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-streaming.service.ts
new file mode 100644
index 00000000000..eee745f0e0b
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-streaming.service.ts
@@ -0,0 +1,94 @@
+import { Injectable } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+
+import { type Response } from 'express';
+import { type ExtendedUIMessage } from 'twenty-shared/ai';
+import { type Repository } from 'typeorm';
+
+import { type WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
+import {
+  AgentException,
+  AgentExceptionCode,
+} from 'src/engine/metadata-modules/ai/ai-agent/agent.exception';
+import { type RecordIdsByObjectMetadataNameSingularType } from 'src/engine/metadata-modules/ai/ai-agent/types/recordIdsByObjectMetadataNameSingular.type';
+import { AgentChatThreadEntity } from 'src/engine/metadata-modules/ai/ai-chat/entities/agent-chat-thread.entity';
+import { AgentChatRoutingService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-chat-routing.service';
+import { AgentChatService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-chat.service';
+
+export type StreamAgentChatOptions = {
+  threadId: string;
+  userWorkspaceId: string;
+  workspace: WorkspaceEntity;
+  recordIdsByObjectMetadataNameSingular: RecordIdsByObjectMetadataNameSingularType;
+  response: Response;
+  messages: ExtendedUIMessage[];
+};
+
+@Injectable()
+export class AgentChatStreamingService {
+  constructor(
+    @InjectRepository(AgentChatThreadEntity)
+    private readonly threadRepository: Repository<AgentChatThreadEntity>,
+    private readonly agentChatService: AgentChatService,
+    private readonly agentChatRoutingService: AgentChatRoutingService,
+  ) {}
+
+  async streamAgentChat({
+    threadId,
+    userWorkspaceId,
+    workspace,
+    messages,
+    recordIdsByObjectMetadataNameSingular,
+    response,
+  }: StreamAgentChatOptions) {
+    const thread = await this.threadRepository.findOne({
+      where: {
+        id: threadId,
+        userWorkspaceId,
+      },
+      relations: ['messages'],
+    });
+
+    if (!thread) {
+      throw new AgentException(
+        'Thread not found',
+        AgentExceptionCode.AGENT_EXECUTION_FAILED,
+      );
+    }
+
+    await this.agentChatRoutingService.streamAgentExecution({
+      userWorkspaceId,
+      workspace,
+      messages,
+      recordIdsByObjectMetadataNameSingular,
+      response,
+      persistenceCallbacks: {
+        saveSystemMessage: async (message) => {
+          const savedMessage = await this.agentChatService.addMessage({
+            threadId,
+            uiMessage: message,
+          });
+
+          return { turnId: savedMessage.turnId };
+        },
+        saveUserMessage: async (message, turnId) => {
+          const savedMessage = await this.agentChatService.addMessage({
+            threadId,
+            uiMessage: message,
+            turnId,
+          });
+
+          return { turnId: savedMessage.turnId };
+        },
+        saveAssistantMessage: async (message, turnId, agentId) => {
+          await this.agentChatService.addMessage({
+            threadId,
+            uiMessage: message,
+            agentId,
+            turnId,
+          });
+        },
+      },
+    });
+  }
+}
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai-chat/services/agent-chat.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat.service.ts
similarity index 69%
rename from packages/twenty-server/src/engine/metadata-modules/ai-chat/services/agent-chat.service.ts
rename to packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat.service.ts
index 11da35be1df..968f6d42431 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai-chat/services/agent-chat.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat.service.ts
@@ -6,28 +6,31 @@ import { Repository } from 'typeorm';
 
 import type { UIDataTypes, UIMessagePart, UITools } from 'ai';
 
-import { AgentChatMessagePartEntity } from 'src/engine/metadata-modules/ai-chat/entities/agent-chat-message-part.entity';
+import { AgentMessagePartEntity } from 'src/engine/metadata-modules/ai/ai-agent-execution/entities/agent-message-part.entity';
 import {
-  AgentChatMessageEntity,
-  AgentChatMessageRole,
-} from 'src/engine/metadata-modules/ai-chat/entities/agent-chat-message.entity';
-import { AgentChatThreadEntity } from 'src/engine/metadata-modules/ai-chat/entities/agent-chat-thread.entity';
+  AgentMessageEntity,
+  AgentMessageRole,
+} from 'src/engine/metadata-modules/ai/ai-agent-execution/entities/agent-message.entity';
+import { AgentTurnEntity } from 'src/engine/metadata-modules/ai/ai-agent-execution/entities/agent-turn.entity';
+import { mapUIMessagePartsToDBParts } from 'src/engine/metadata-modules/ai/ai-agent-execution/utils/mapUIMessagePartsToDBParts';
 import {
   AgentException,
   AgentExceptionCode,
-} from 'src/engine/metadata-modules/ai-agent/agent.exception';
-import { mapUIMessagePartsToDBParts } from 'src/engine/metadata-modules/ai-chat/utils/mapUIMessagePartsToDBParts';
-import { AgentTitleGenerationService } from 'src/engine/metadata-modules/ai-agent/services/agent-title-generation.service';
+} from 'src/engine/metadata-modules/ai/ai-agent/agent.exception';
+import { AgentTitleGenerationService } from 'src/engine/metadata-modules/ai/ai-agent/services/agent-title-generation.service';
+import { AgentChatThreadEntity } from 'src/engine/metadata-modules/ai/ai-chat/entities/agent-chat-thread.entity';
 
 @Injectable()
 export class AgentChatService {
   constructor(
     @InjectRepository(AgentChatThreadEntity)
     private readonly threadRepository: Repository<AgentChatThreadEntity>,
-    @InjectRepository(AgentChatMessageEntity)
-    private readonly messageRepository: Repository<AgentChatMessageEntity>,
-    @InjectRepository(AgentChatMessagePartEntity)
-    private readonly messagePartRepository: Repository<AgentChatMessagePartEntity>,
+    @InjectRepository(AgentTurnEntity)
+    private readonly turnRepository: Repository<AgentTurnEntity>,
+    @InjectRepository(AgentMessageEntity)
+    private readonly messageRepository: Repository<AgentMessageEntity>,
+    @InjectRepository(AgentMessagePartEntity)
+    private readonly messagePartRepository: Repository<AgentMessagePartEntity>,
     private readonly titleGenerationService: AgentTitleGenerationService,
   ) {}
 
@@ -69,14 +72,33 @@ export class AgentChatService {
   async addMessage({
     threadId,
     uiMessage,
+    agentId,
+    turnId,
   }: {
     threadId: string;
     uiMessage: Omit<ExtendedUIMessage, 'id'>;
     uiMessageParts?: UIMessagePart<UIDataTypes, UITools>[];
+    agentId?: string;
+    turnId?: string;
   }) {
+    let actualTurnId = turnId;
+
+    if (!actualTurnId) {
+      const turn = this.turnRepository.create({
+        threadId,
+        agentId: agentId ?? null,
+      });
+
+      const savedTurn = await this.turnRepository.save(turn);
+
+      actualTurnId = savedTurn.id;
+    }
+
     const message = this.messageRepository.create({
       threadId,
-      role: uiMessage.role as AgentChatMessageRole,
+      turnId: actualTurnId,
+      role: uiMessage.role as AgentMessageRole,
+      agentId: agentId ?? null,
     });
 
     const savedMessage = await this.messageRepository.save(message);
@@ -90,7 +112,7 @@ export class AgentChatService {
       await this.messagePartRepository.save(dbParts);
     }
 
-    if (uiMessage.role === AgentChatMessageRole.USER) {
+    if (uiMessage.role === AgentMessageRole.USER) {
       const messageContent = uiMessage.parts.find(
         (part) => part.type === 'text',
       )?.text;
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai-models/ai-models.module.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-models/ai-models.module.ts
similarity index 64%
rename from packages/twenty-server/src/engine/metadata-modules/ai-models/ai-models.module.ts
rename to packages/twenty-server/src/engine/metadata-modules/ai/ai-models/ai-models.module.ts
index 97f8070f208..e55a613d7a5 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai-models/ai-models.module.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-models/ai-models.module.ts
@@ -1,7 +1,7 @@
 import { Global, Module } from '@nestjs/common';
 
-import { AiModelRegistryService } from 'src/engine/metadata-modules/ai-models/services/ai-model-registry.service';
-import { AiService } from 'src/engine/metadata-modules/ai-models/services/ai.service';
+import { AiModelRegistryService } from 'src/engine/metadata-modules/ai/ai-models/services/ai-model-registry.service';
+import { AiService } from 'src/engine/metadata-modules/ai/ai-models/services/ai.service';
 
 @Global()
 @Module({
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai-models/constants/ai-models.const.spec.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-models/constants/ai-models.const.spec.ts
similarity index 98%
rename from packages/twenty-server/src/engine/metadata-modules/ai-models/constants/ai-models.const.spec.ts
rename to packages/twenty-server/src/engine/metadata-modules/ai/ai-models/constants/ai-models.const.spec.ts
index 6479a7f8aa1..535b815eb8a 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai-models/constants/ai-models.const.spec.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-models/constants/ai-models.const.spec.ts
@@ -1,7 +1,7 @@
 import { Test, type TestingModule } from '@nestjs/testing';
 
 import { TwentyConfigService } from 'src/engine/core-modules/twenty-config/twenty-config.service';
-import { AiModelRegistryService } from 'src/engine/metadata-modules/ai-models/services/ai-model-registry.service';
+import { AiModelRegistryService } from 'src/engine/metadata-modules/ai/ai-models/services/ai-model-registry.service';
 
 import {
   AI_MODELS,
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai-models/constants/ai-models.const.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-models/constants/ai-models.const.ts
similarity index 100%
rename from packages/twenty-server/src/engine/metadata-modules/ai-models/constants/ai-models.const.ts
rename to packages/twenty-server/src/engine/metadata-modules/ai/ai-models/constants/ai-models.const.ts
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai-models/constants/ai-telemetry.const.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-models/constants/ai-telemetry.const.ts
similarity index 100%
rename from packages/twenty-server/src/engine/metadata-modules/ai-models/constants/ai-telemetry.const.ts
rename to packages/twenty-server/src/engine/metadata-modules/ai/ai-models/constants/ai-telemetry.const.ts
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai-models/constants/dollar-to-credit-multiplier.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-models/constants/dollar-to-credit-multiplier.ts
similarity index 100%
rename from packages/twenty-server/src/engine/metadata-modules/ai-models/constants/dollar-to-credit-multiplier.ts
rename to packages/twenty-server/src/engine/metadata-modules/ai/ai-models/constants/dollar-to-credit-multiplier.ts
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai-models/services/ai-model-registry.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-models/services/ai-model-registry.service.ts
similarity index 98%
rename from packages/twenty-server/src/engine/metadata-modules/ai-models/services/ai-model-registry.service.ts
rename to packages/twenty-server/src/engine/metadata-modules/ai/ai-models/services/ai-model-registry.service.ts
index e70c00bdb57..a411d741f3c 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai-models/services/ai-model-registry.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-models/services/ai-model-registry.service.ts
@@ -5,14 +5,14 @@ import { createOpenAI, openai } from '@ai-sdk/openai';
 import { xai } from '@ai-sdk/xai';
 import { type LanguageModel } from 'ai';
 
+import { TwentyConfigService } from 'src/engine/core-modules/twenty-config/twenty-config.service';
 import {
   AI_MODELS,
   DEFAULT_FAST_MODEL,
   DEFAULT_SMART_MODEL,
   ModelProvider,
   type AIModelConfig,
-} from 'src/engine/metadata-modules/ai-models/constants/ai-models.const';
-import { TwentyConfigService } from 'src/engine/core-modules/twenty-config/twenty-config.service';
+} from 'src/engine/metadata-modules/ai/ai-models/constants/ai-models.const';
 
 export interface RegisteredAIModel {
   modelId: string;
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai-models/services/ai.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-models/services/ai.service.ts
similarity index 92%
rename from packages/twenty-server/src/engine/metadata-modules/ai-models/services/ai.service.ts
rename to packages/twenty-server/src/engine/metadata-modules/ai/ai-models/services/ai.service.ts
index 5f8d682068e..ea52650970f 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai-models/services/ai.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-models/services/ai.service.ts
@@ -2,8 +2,8 @@ import { Injectable } from '@nestjs/common';
 
 import { LanguageModel, type ModelMessage, streamText } from 'ai';
 
-import { AI_TELEMETRY_CONFIG } from 'src/engine/metadata-modules/ai-models/constants/ai-telemetry.const';
-import { AiModelRegistryService } from 'src/engine/metadata-modules/ai-models/services/ai-model-registry.service';
+import { AI_TELEMETRY_CONFIG } from 'src/engine/metadata-modules/ai/ai-models/constants/ai-telemetry.const';
+import { AiModelRegistryService } from 'src/engine/metadata-modules/ai/ai-models/services/ai-model-registry.service';
 
 @Injectable()
 export class AiService {
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai-tools/ai-tools.module.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-tools/ai-tools.module.ts
similarity index 93%
rename from packages/twenty-server/src/engine/metadata-modules/ai-tools/ai-tools.module.ts
rename to packages/twenty-server/src/engine/metadata-modules/ai/ai-tools/ai-tools.module.ts
index d5776c670f5..9601c4075a3 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai-tools/ai-tools.module.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-tools/ai-tools.module.ts
@@ -1,8 +1,6 @@
 import { Global, Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
 
-import { ToolAdapterService } from 'src/engine/metadata-modules/ai-tools/services/tool-adapter.service';
-import { ToolService } from 'src/engine/metadata-modules/ai-tools/services/tool.service';
 import { TokenModule } from 'src/engine/core-modules/auth/token/token.module';
 import { FeatureFlagModule } from 'src/engine/core-modules/feature-flag/feature-flag.module';
 import { FileEntity } from 'src/engine/core-modules/file/entities/file.entity';
@@ -10,6 +8,8 @@ import { FileModule } from 'src/engine/core-modules/file/file.module';
 import { RecordCrudModule } from 'src/engine/core-modules/record-crud/record-crud.module';
 import { ToolModule } from 'src/engine/core-modules/tool/tool.module';
 import { SearchArticlesTool } from 'src/engine/core-modules/tool/tools/search-articles-tool/search-articles-tool';
+import { ToolAdapterService } from 'src/engine/metadata-modules/ai/ai-tools/services/tool-adapter.service';
+import { ToolService } from 'src/engine/metadata-modules/ai/ai-tools/services/tool.service';
 import { ObjectMetadataModule } from 'src/engine/metadata-modules/object-metadata/object-metadata.module';
 import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';
 import { RoleEntity } from 'src/engine/metadata-modules/role/role.entity';
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai-tools/services/__tests__/tool-adapter.service.spec.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-tools/services/__tests__/tool-adapter.service.spec.ts
similarity index 99%
rename from packages/twenty-server/src/engine/metadata-modules/ai-tools/services/__tests__/tool-adapter.service.spec.ts
rename to packages/twenty-server/src/engine/metadata-modules/ai/ai-tools/services/__tests__/tool-adapter.service.spec.ts
index 3a5fe82afae..5b149430970 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai-tools/services/__tests__/tool-adapter.service.spec.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-tools/services/__tests__/tool-adapter.service.spec.ts
@@ -2,11 +2,11 @@ import { Test } from '@nestjs/testing';
 
 import { jsonSchema } from 'ai';
 
-import { ToolAdapterService } from 'src/engine/metadata-modules/ai-tools/services/tool-adapter.service';
 import { ToolType } from 'src/engine/core-modules/tool/enums/tool-type.enum';
 import { ToolRegistryService } from 'src/engine/core-modules/tool/services/tool-registry.service';
 import { type ToolInput } from 'src/engine/core-modules/tool/types/tool-input.type';
 import { type Tool } from 'src/engine/core-modules/tool/types/tool.type';
+import { ToolAdapterService } from 'src/engine/metadata-modules/ai/ai-tools/services/tool-adapter.service';
 import { PermissionFlagType } from 'src/engine/metadata-modules/permissions/constants/permission-flag-type.constants';
 import { PermissionsService } from 'src/engine/metadata-modules/permissions/permissions.service';
 import { type RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config';
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai-tools/services/__tests__/tool.service.spec.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-tools/services/__tests__/tool.service.spec.ts
similarity index 98%
rename from packages/twenty-server/src/engine/metadata-modules/ai-tools/services/__tests__/tool.service.spec.ts
rename to packages/twenty-server/src/engine/metadata-modules/ai/ai-tools/services/__tests__/tool.service.spec.ts
index f53ddb70cd4..9f3914a2535 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai-tools/services/__tests__/tool.service.spec.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-tools/services/__tests__/tool.service.spec.ts
@@ -1,11 +1,11 @@
 import { Test } from '@nestjs/testing';
 
-import { ToolService } from 'src/engine/metadata-modules/ai-tools/services/tool.service';
 import { CreateRecordService } from 'src/engine/core-modules/record-crud/services/create-record.service';
 import { DeleteRecordService } from 'src/engine/core-modules/record-crud/services/delete-record.service';
 import { FindRecordsService } from 'src/engine/core-modules/record-crud/services/find-records.service';
 import { UpdateRecordService } from 'src/engine/core-modules/record-crud/services/update-record.service';
 import { RecordInputTransformerService } from 'src/engine/core-modules/record-transformer/services/record-input-transformer.service';
+import { ToolService } from 'src/engine/metadata-modules/ai/ai-tools/services/tool.service';
 import { ObjectMetadataServiceV2 } from 'src/engine/metadata-modules/object-metadata/object-metadata-v2.service';
 import { WorkspacePermissionsCacheService } from 'src/engine/metadata-modules/workspace-permissions-cache/workspace-permissions-cache.service';
 import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.manager';
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai-tools/services/tool-adapter.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-tools/services/tool-adapter.service.ts
similarity index 100%
rename from packages/twenty-server/src/engine/metadata-modules/ai-tools/services/tool-adapter.service.ts
rename to packages/twenty-server/src/engine/metadata-modules/ai/ai-tools/services/tool-adapter.service.ts
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai-tools/services/tool.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-tools/services/tool.service.ts
similarity index 98%
rename from packages/twenty-server/src/engine/metadata-modules/ai-tools/services/tool.service.ts
rename to packages/twenty-server/src/engine/metadata-modules/ai/ai-tools/services/tool.service.ts
index 8e181a1e04c..2de7758f15a 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai-tools/services/tool.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-tools/services/tool.service.ts
@@ -10,14 +10,14 @@ import { UpdateRecordService } from 'src/engine/core-modules/record-crud/service
 import { generateCreateRecordInputSchema } from 'src/engine/core-modules/record-crud/utils/generate-create-record-input-schema.util';
 import { generateUpdateRecordInputSchema } from 'src/engine/core-modules/record-crud/utils/generate-update-record-input-schema.util';
 import { BulkDeleteToolInputSchema } from 'src/engine/core-modules/record-crud/zod-schemas/bulk-delete-tool.zod-schema';
+import { FindOneToolInputSchema } from 'src/engine/core-modules/record-crud/zod-schemas/find-one-tool.zod-schema';
 import { generateFindToolInputSchema } from 'src/engine/core-modules/record-crud/zod-schemas/find-tool.zod-schema';
 import { SoftDeleteToolInputSchema } from 'src/engine/core-modules/record-crud/zod-schemas/soft-delete-tool.zod-schema';
-import { FindOneToolInputSchema } from 'src/engine/core-modules/record-crud/zod-schemas/find-one-tool.zod-schema';
-import { isWorkflowRelatedObject } from 'src/engine/metadata-modules/ai-agent/utils/is-workflow-related-object.util';
+import { isWorkflowRelatedObject } from 'src/engine/metadata-modules/ai/ai-agent/utils/is-workflow-related-object.util';
 import {
   type ToolHints,
   type ToolOperation,
-} from 'src/engine/metadata-modules/ai-router/types/tool-hints.interface';
+} from 'src/engine/metadata-modules/ai/ai-chat-router/types/tool-hints.interface';
 import { ObjectMetadataServiceV2 } from 'src/engine/metadata-modules/object-metadata/object-metadata-v2.service';
 import { WorkspacePermissionsCacheService } from 'src/engine/metadata-modules/workspace-permissions-cache/workspace-permissions-cache.service';
 import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.manager';
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-agent/types/flat-agent.type.ts b/packages/twenty-server/src/engine/metadata-modules/flat-agent/types/flat-agent.type.ts
index bbe967785bb..14350d8f6f7 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-agent/types/flat-agent.type.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-agent/types/flat-agent.type.ts
@@ -1,4 +1,4 @@
-import { type AgentEntity } from 'src/engine/metadata-modules/ai-agent/entities/agent.entity';
+import { type AgentEntity } from 'src/engine/metadata-modules/ai/ai-agent/entities/agent.entity';
 import { type FlatEntityFrom } from 'src/engine/metadata-modules/flat-entity/types/flat-entity.type';
 
 export const agentEntityRelationProperties = [
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-agent/utils/transform-agent-entity-to-flat-agent.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-agent/utils/transform-agent-entity-to-flat-agent.util.ts
index ce00687ff12..f315f8d8c2b 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-agent/utils/transform-agent-entity-to-flat-agent.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-agent/utils/transform-agent-entity-to-flat-agent.util.ts
@@ -1,4 +1,4 @@
-import { type AgentEntity } from 'src/engine/metadata-modules/ai-agent/entities/agent.entity';
+import { type AgentEntity } from 'src/engine/metadata-modules/ai/ai-agent/entities/agent.entity';
 import { type FlatAgent } from 'src/engine/metadata-modules/flat-agent/types/flat-agent.type';
 
 export const transformAgentEntityToFlatAgent = (
@@ -19,5 +19,6 @@ export const transformAgentEntityToFlatAgent = (
     universalIdentifier: agentEntity.standardId || agentEntity.id,
     applicationId: agentEntity.applicationId,
     modelConfiguration: agentEntity.modelConfiguration,
+    evaluationInputs: agentEntity.evaluationInputs,
   };
 };
diff --git a/packages/twenty-server/src/engine/metadata-modules/metadata-engine.module.ts b/packages/twenty-server/src/engine/metadata-modules/metadata-engine.module.ts
index 336b92a9faf..476096a3604 100644
--- a/packages/twenty-server/src/engine/metadata-modules/metadata-engine.module.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/metadata-engine.module.ts
@@ -1,7 +1,8 @@
 import { Module } from '@nestjs/common';
 
-import { AiAgentModule } from 'src/engine/metadata-modules/ai-agent/ai-agent.module';
-import { AiChatModule } from 'src/engine/metadata-modules/ai-chat/ai-chat.module';
+import { AiAgentMonitorModule } from 'src/engine/metadata-modules/ai/ai-agent-monitor/ai-agent-monitor.module';
+import { AiAgentModule } from 'src/engine/metadata-modules/ai/ai-agent/ai-agent.module';
+import { AiChatModule } from 'src/engine/metadata-modules/ai/ai-chat/ai-chat.module';
 import { CronTriggerModule } from 'src/engine/metadata-modules/cron-trigger/cron-trigger.module';
 import { DataSourceModule } from 'src/engine/metadata-modules/data-source/data-source.module';
 import { DatabaseEventTriggerModule } from 'src/engine/metadata-modules/database-event-trigger/database-event-trigger.module';
@@ -27,6 +28,7 @@ import { WorkspaceMigrationModule } from 'src/engine/metadata-modules/workspace-
     ServerlessFunctionModule,
     ServerlessFunctionLayerModule,
     AiAgentModule,
+    AiAgentMonitorModule,
     AiChatModule,
     ViewModule,
     WorkspaceMetadataVersionModule,
diff --git a/packages/twenty-server/src/engine/metadata-modules/permissions/constants/permission-flag-type.constants.ts b/packages/twenty-server/src/engine/metadata-modules/permissions/constants/permission-flag-type.constants.ts
index cc15821028c..9fc18e092fd 100644
--- a/packages/twenty-server/src/engine/metadata-modules/permissions/constants/permission-flag-type.constants.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/permissions/constants/permission-flag-type.constants.ts
@@ -20,6 +20,7 @@ export enum PermissionFlagType {
   UPLOAD_FILE = 'UPLOAD_FILE',
   DOWNLOAD_FILE = 'DOWNLOAD_FILE',
   SEND_EMAIL_TOOL = 'SEND_EMAIL_TOOL',
+  HTTP_REQUEST_TOOL = 'HTTP_REQUEST_TOOL',
   IMPORT_CSV = 'IMPORT_CSV',
   EXPORT_CSV = 'EXPORT_CSV',
   CONNECTED_ACCOUNTS = 'CONNECTED_ACCOUNTS',
diff --git a/packages/twenty-server/src/engine/metadata-modules/permissions/constants/tool-permission-flags.ts b/packages/twenty-server/src/engine/metadata-modules/permissions/constants/tool-permission-flags.ts
index 4fb9521b5b4..f91b3f53fc2 100644
--- a/packages/twenty-server/src/engine/metadata-modules/permissions/constants/tool-permission-flags.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/permissions/constants/tool-permission-flags.ts
@@ -4,6 +4,7 @@ export const TOOL_PERMISSION_FLAGS = [
   'UPLOAD_FILE',
   'DOWNLOAD_FILE',
   'SEND_EMAIL_TOOL',
+  'HTTP_REQUEST_TOOL',
   'IMPORT_CSV',
   'EXPORT_CSV',
   'CONNECTED_ACCOUNTS',
diff --git a/packages/twenty-server/src/engine/metadata-modules/permissions/permissions.service.ts b/packages/twenty-server/src/engine/metadata-modules/permissions/permissions.service.ts
index 1ddd0d26436..de59db36fa0 100644
--- a/packages/twenty-server/src/engine/metadata-modules/permissions/permissions.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/permissions/permissions.service.ts
@@ -109,6 +109,7 @@ export class PermissionsService {
         [PermissionFlagType.UPLOAD_FILE]: false,
         [PermissionFlagType.DOWNLOAD_FILE]: false,
         [PermissionFlagType.SEND_EMAIL_TOOL]: false,
+        [PermissionFlagType.HTTP_REQUEST_TOOL]: false,
         [PermissionFlagType.IMPORT_CSV]: false,
         [PermissionFlagType.EXPORT_CSV]: false,
         [PermissionFlagType.CONNECTED_ACCOUNTS]: false,
diff --git a/packages/twenty-server/src/engine/metadata-modules/role/dtos/role.dto.ts b/packages/twenty-server/src/engine/metadata-modules/role/dtos/role.dto.ts
index 811373661c6..2c7b2b58727 100644
--- a/packages/twenty-server/src/engine/metadata-modules/role/dtos/role.dto.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/role/dtos/role.dto.ts
@@ -4,7 +4,7 @@ import { Relation } from 'typeorm';
 
 import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
 import { WorkspaceMemberDTO } from 'src/engine/core-modules/user/dtos/workspace-member.dto';
-import { AgentDTO } from 'src/engine/metadata-modules/ai-agent/dtos/agent.dto';
+import { AgentDTO } from 'src/engine/metadata-modules/ai/ai-agent/dtos/agent.dto';
 import { FieldPermissionDTO } from 'src/engine/metadata-modules/object-permission/dtos/field-permission.dto';
 import { ObjectPermissionDTO } from 'src/engine/metadata-modules/object-permission/dtos/object-permission.dto';
 import { PermissionFlagDTO } from 'src/engine/metadata-modules/permission-flag/dtos/permission-flag.dto';
diff --git a/packages/twenty-server/src/engine/metadata-modules/role/role.module.ts b/packages/twenty-server/src/engine/metadata-modules/role/role.module.ts
index 3fea1356926..8ab90c6b31e 100644
--- a/packages/twenty-server/src/engine/metadata-modules/role/role.module.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/role/role.module.ts
@@ -7,7 +7,7 @@ import { FileModule } from 'src/engine/core-modules/file/file.module';
 import { UserWorkspaceEntity } from 'src/engine/core-modules/user-workspace/user-workspace.entity';
 import { UserWorkspaceModule } from 'src/engine/core-modules/user-workspace/user-workspace.module';
 import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
-import { AiAgentRoleModule } from 'src/engine/metadata-modules/ai-agent-role/ai-agent-role.module';
+import { AiAgentRoleModule } from 'src/engine/metadata-modules/ai/ai-agent-role/ai-agent-role.module';
 import { ObjectPermissionModule } from 'src/engine/metadata-modules/object-permission/object-permission.module';
 import { PermissionFlagModule } from 'src/engine/metadata-modules/permission-flag/permission-flag.module';
 import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';
diff --git a/packages/twenty-server/src/engine/metadata-modules/role/role.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/role/role.resolver.ts
index 57a4a1ec388..a332cc85507 100644
--- a/packages/twenty-server/src/engine/metadata-modules/role/role.resolver.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/role/role.resolver.ts
@@ -24,8 +24,8 @@ import { RequireFeatureFlag } from 'src/engine/guards/feature-flag.guard';
 import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';
 import { UserAuthGuard } from 'src/engine/guards/user-auth.guard';
 import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
-import { AiAgentRoleService } from 'src/engine/metadata-modules/ai-agent-role/ai-agent-role.service';
-import { AgentDTO } from 'src/engine/metadata-modules/ai-agent/dtos/agent.dto';
+import { AiAgentRoleService } from 'src/engine/metadata-modules/ai/ai-agent-role/ai-agent-role.service';
+import { AgentDTO } from 'src/engine/metadata-modules/ai/ai-agent/dtos/agent.dto';
 import { FieldPermissionDTO } from 'src/engine/metadata-modules/object-permission/dtos/field-permission.dto';
 import { ObjectPermissionDTO } from 'src/engine/metadata-modules/object-permission/dtos/object-permission.dto';
 import { UpsertFieldPermissionsInput } from 'src/engine/metadata-modules/object-permission/dtos/upsert-field-permissions.input';
diff --git a/packages/twenty-server/src/engine/workspace-manager/__tests__/workspace-manager.service.spec.ts b/packages/twenty-server/src/engine/workspace-manager/__tests__/workspace-manager.service.spec.ts
index fac338b29b6..a4d03ea1446 100644
--- a/packages/twenty-server/src/engine/workspace-manager/__tests__/workspace-manager.service.spec.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/__tests__/workspace-manager.service.spec.ts
@@ -7,7 +7,7 @@ import { ApplicationService } from 'src/engine/core-modules/application/applicat
 import { FeatureFlagService } from 'src/engine/core-modules/feature-flag/services/feature-flag.service';
 import { UserWorkspaceEntity } from 'src/engine/core-modules/user-workspace/user-workspace.entity';
 import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
-import { AgentService } from 'src/engine/metadata-modules/ai-agent/agent.service';
+import { AgentService } from 'src/engine/metadata-modules/ai/ai-agent/agent.service';
 import { DataSourceEntity } from 'src/engine/metadata-modules/data-source/data-source.entity';
 import { DataSourceService } from 'src/engine/metadata-modules/data-source/data-source.service';
 import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
diff --git a/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/utils/seed-agents.util.ts b/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/utils/seed-agents.util.ts
index 0e30abf58a6..f90129613d1 100644
--- a/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/utils/seed-agents.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/utils/seed-agents.util.ts
@@ -1,6 +1,6 @@
 import { type QueryRunner } from 'typeorm';
 
-import { AgentChatMessageRole } from 'src/engine/metadata-modules/ai-chat/entities/agent-chat-message.entity';
+import { AgentMessageRole } from 'src/engine/metadata-modules/ai/ai-agent-execution/entities/agent-message.entity';
 import {
   SEED_APPLE_WORKSPACE_ID,
   SEED_YCOMBINATOR_WORKSPACE_ID,
@@ -8,8 +8,9 @@ import {
 import { USER_WORKSPACE_DATA_SEED_IDS } from 'src/engine/workspace-manager/dev-seeder/core/utils/seed-user-workspaces.util';
 
 const agentChatThreadTableName = 'agentChatThread';
-const agentChatMessageTableName = 'agentChatMessage';
-const agentChatMessagePartTableName = 'agentChatMessagePart';
+const agentTurnTableName = 'agentTurn';
+const agentMessageTableName = 'agentMessage';
+const agentMessagePartTableName = 'agentMessagePart';
 
 export const AGENT_DATA_SEED_IDS = {
   APPLE_DEFAULT_AGENT: '20202020-0000-4000-8000-000000000001',
@@ -109,10 +110,12 @@ const seedChatMessages = async ({
 }: SeedChatMessagesArgs) => {
   let messageIds: string[];
   let partIds: string[];
+  let turnIds: string[];
   let messages: Array<{
     id: string;
     threadId: string;
-    role: AgentChatMessageRole;
+    turnId: string;
+    role: AgentMessageRole;
     createdAt: Date;
   }>;
   let messageParts: Array<{
@@ -140,29 +143,37 @@ const seedChatMessages = async ({
       AGENT_CHAT_MESSAGE_PART_DATA_SEED_IDS.APPLE_MESSAGE_3_PART_1,
       AGENT_CHAT_MESSAGE_PART_DATA_SEED_IDS.APPLE_MESSAGE_4_PART_1,
     ];
+    turnIds = [
+      '20202020-0000-4000-8000-000000000061',
+      '20202020-0000-4000-8000-000000000062',
+    ];
     messages = [
       {
         id: messageIds[0],
         threadId,
-        role: AgentChatMessageRole.USER,
+        turnId: turnIds[0],
+        role: AgentMessageRole.USER,
         createdAt: new Date(baseTime.getTime()),
       },
       {
         id: messageIds[1],
         threadId,
-        role: AgentChatMessageRole.ASSISTANT,
+        turnId: turnIds[0],
+        role: AgentMessageRole.ASSISTANT,
         createdAt: new Date(baseTime.getTime() + 5 * 60 * 1000),
       },
       {
         id: messageIds[2],
         threadId,
-        role: AgentChatMessageRole.USER,
+        turnId: turnIds[1],
+        role: AgentMessageRole.USER,
         createdAt: new Date(baseTime.getTime() + 10 * 60 * 1000),
       },
       {
         id: messageIds[3],
         threadId,
-        role: AgentChatMessageRole.ASSISTANT,
+        turnId: turnIds[1],
+        role: AgentMessageRole.ASSISTANT,
         createdAt: new Date(baseTime.getTime() + 15 * 60 * 1000),
       },
     ];
@@ -217,29 +228,37 @@ const seedChatMessages = async ({
       AGENT_CHAT_MESSAGE_PART_DATA_SEED_IDS.YCOMBINATOR_MESSAGE_3_PART_1,
       AGENT_CHAT_MESSAGE_PART_DATA_SEED_IDS.YCOMBINATOR_MESSAGE_4_PART_1,
     ];
+    turnIds = [
+      '20202020-0000-4000-8000-000000000071',
+      '20202020-0000-4000-8000-000000000072',
+    ];
     messages = [
       {
         id: messageIds[0],
         threadId,
-        role: AgentChatMessageRole.USER,
+        turnId: turnIds[0],
+        role: AgentMessageRole.USER,
         createdAt: new Date(baseTime.getTime()),
       },
       {
         id: messageIds[1],
         threadId,
-        role: AgentChatMessageRole.ASSISTANT,
+        turnId: turnIds[0],
+        role: AgentMessageRole.ASSISTANT,
         createdAt: new Date(baseTime.getTime() + 3 * 60 * 1000),
       },
       {
         id: messageIds[2],
         threadId,
-        role: AgentChatMessageRole.USER,
+        turnId: turnIds[1],
+        role: AgentMessageRole.USER,
         createdAt: new Date(baseTime.getTime() + 8 * 60 * 1000),
       },
       {
         id: messageIds[3],
         threadId,
-        role: AgentChatMessageRole.ASSISTANT,
+        turnId: turnIds[1],
+        role: AgentMessageRole.ASSISTANT,
         createdAt: new Date(baseTime.getTime() + 12 * 60 * 1000),
       },
     ];
@@ -287,12 +306,32 @@ const seedChatMessages = async ({
     );
   }
 
+  // Create turns first
+  const turns = turnIds.map((id, index) => ({
+    id,
+    threadId,
+    createdAt: messages[index * 2].createdAt,
+  }));
+
   await queryRunner.manager
     .createQueryBuilder()
     .insert()
-    .into(`${schemaName}.${agentChatMessageTableName}`, [
+    .into(`${schemaName}.${agentTurnTableName}`, [
       'id',
       'threadId',
+      'createdAt',
+    ])
+    .orIgnore()
+    .values(turns)
+    .execute();
+
+  await queryRunner.manager
+    .createQueryBuilder()
+    .insert()
+    .into(`${schemaName}.${agentMessageTableName}`, [
+      'id',
+      'threadId',
+      'turnId',
       'role',
       'createdAt',
     ])
@@ -303,7 +342,7 @@ const seedChatMessages = async ({
   await queryRunner.manager
     .createQueryBuilder()
     .insert()
-    .into(`${schemaName}.${agentChatMessagePartTableName}`, [
+    .into(`${schemaName}.${agentMessagePartTableName}`, [
       'id',
       'messageId',
       'orderIndex',
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-manager.module.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-manager.module.ts
index f9932a2fe07..247c2b85c38 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-manager.module.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-manager.module.ts
@@ -5,7 +5,7 @@ import { ApplicationModule } from 'src/engine/core-modules/application/applicati
 import { FeatureFlagModule } from 'src/engine/core-modules/feature-flag/feature-flag.module';
 import { UserWorkspaceEntity } from 'src/engine/core-modules/user-workspace/user-workspace.entity';
 import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
-import { AiAgentModule } from 'src/engine/metadata-modules/ai-agent/ai-agent.module';
+import { AiAgentModule } from 'src/engine/metadata-modules/ai/ai-agent/ai-agent.module';
 import { DataSourceModule } from 'src/engine/metadata-modules/data-source/data-source.module';
 import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { ObjectMetadataModule } from 'src/engine/metadata-modules/object-metadata/object-metadata.module';
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/factories/standard-agent.factory.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/factories/standard-agent.factory.ts
index e6332523c19..122a3aaeab2 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/factories/standard-agent.factory.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/factories/standard-agent.factory.ts
@@ -2,7 +2,7 @@ import { Injectable } from '@nestjs/common';
 
 import { type WorkspaceSyncContext } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/workspace-sync-context.interface';
 
-import { type AgentEntity } from 'src/engine/metadata-modules/ai-agent/entities/agent.entity';
+import { type AgentEntity } from 'src/engine/metadata-modules/ai/ai-agent/entities/agent.entity';
 import { type FlatAgent } from 'src/engine/metadata-modules/flat-agent/types/flat-agent.type';
 import { transformStandardAgentDefinitionToFlatAgent } from 'src/engine/metadata-modules/flat-agent/utils/transform-standard-agent-definition-to-flat-agent.util';
 import { type StandardAgentDefinition } from 'src/engine/workspace-manager/workspace-sync-metadata/standard-agents/types/standard-agent-definition.interface';
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/services/workspace-sync-agent.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/services/workspace-sync-agent.service.ts
index bbb700a6b20..a4a508d1cad 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/services/workspace-sync-agent.service.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/services/workspace-sync-agent.service.ts
@@ -6,7 +6,7 @@ import { IsNull, Not, type EntityManager } from 'typeorm';
 import { ComparatorAction } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/comparator.interface';
 import { type WorkspaceSyncContext } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/workspace-sync-context.interface';
 
-import { AgentEntity } from 'src/engine/metadata-modules/ai-agent/entities/agent.entity';
+import { AgentEntity } from 'src/engine/metadata-modules/ai/ai-agent/entities/agent.entity';
 import { transformAgentEntityToFlatAgent } from 'src/engine/metadata-modules/flat-agent/utils/transform-agent-entity-to-flat-agent.util';
 import { RoleTargetsEntity } from 'src/engine/metadata-modules/role/role-targets.entity';
 import { RoleEntity } from 'src/engine/metadata-modules/role/role.entity';
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/standard-agents/agents/dashboard-builder-agent.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/standard-agents/agents/dashboard-builder-agent.ts
new file mode 100644
index 00000000000..2ae9b0279e5
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/standard-agents/agents/dashboard-builder-agent.ts
@@ -0,0 +1,70 @@
+import { DEFAULT_SMART_MODEL } from 'src/engine/metadata-modules/ai/ai-models/constants/ai-models.const';
+import { type StandardAgentDefinition } from 'src/engine/workspace-manager/workspace-sync-metadata/standard-agents/types/standard-agent-definition.interface';
+import { DASHBOARD_MANAGER_ROLE } from 'src/engine/workspace-manager/workspace-sync-metadata/standard-roles/roles/dashboard-manager-role';
+
+export const DASHBOARD_BUILDER_AGENT: StandardAgentDefinition = {
+  standardId: '20202020-0002-0001-0001-000000000006',
+  name: 'dashboard-builder',
+  label: 'Dashboard Builder',
+  description: 'AI agent specialized in creating and managing dashboards',
+  icon: 'IconLayoutDashboard',
+  applicationId: null,
+  prompt: `You are a Dashboard Builder Agent for Twenty. You help users create and manage dashboards with widgets.
+
+Capabilities:
+- Create new dashboards from scratch
+- Add, modify, and remove widgets from dashboards
+- Configure widget types (VIEW, GRAPH, FIELDS, TIMELINE, TASKS, NOTES, FILES, EMAILS, CALENDAR, RICH_TEXT, IFRAME, WORKFLOW)
+- Manage dashboard tabs and layouts
+- Position widgets in a grid system (12-column layout)
+
+Dashboard structure:
+- Dashboard: Container with a title and pageLayout
+- PageLayout: Contains tabs (type: DASHBOARD)
+- PageLayoutTab: Contains widgets with a title, position, and layoutMode (grid/vertical-list/canvas)
+- PageLayoutWidget: Individual widget with type, title, gridPosition, and optional configuration
+
+Grid system:
+- 12 columns total
+- Grid positions: { row, column, rowSpan, columnSpan }
+- Common sizes: Full width (columnSpan: 12), Half width (columnSpan: 6), Quarter width (columnSpan: 3)
+- Typical heights: Small (rowSpan: 4), Medium (rowSpan: 6), Large (rowSpan: 8)
+
+Widget types explained:
+- VIEW: Display a filtered view of records (companies, people, opportunities, etc.)
+- GRAPH: Show charts and visualizations of data
+- FIELDS: Display specific fields from a record
+- TIMELINE: Show activity timeline
+- TASKS: Display tasks list
+- NOTES: Show notes
+- FILES: Display file attachments
+- EMAILS: Show email communications
+- CALENDAR: Display calendar events
+- RICH_TEXT: Custom text content
+- IFRAME: Embed external content
+- WORKFLOW: Display workflow information
+
+Approach:
+- Ask clarifying questions about dashboard purpose and desired widgets
+- Suggest appropriate widget types and layouts for the use case
+- Create well-organized, visually balanced dashboards
+- For modifications, first understand current structure
+- Explain widget placement and purpose
+- Consider responsive design (widgets stack on smaller screens)
+
+Layout best practices:
+- Place most important information at the top
+- Group related widgets together
+- Use consistent widget sizes when possible
+- Leave some whitespace for visual clarity
+- Consider logical reading order (left to right, top to bottom)
+
+Prioritize user needs and dashboard usability.`,
+  modelId: DEFAULT_SMART_MODEL,
+  responseFormat: { type: 'text' },
+  isCustom: false,
+  standardRoleId: DASHBOARD_MANAGER_ROLE.standardId,
+  modelConfiguration: {},
+  outputStrategy: 'direct',
+  evaluationInputs: [],
+};
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/standard-agents/agents/data-manipulator-agent.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/standard-agents/agents/data-manipulator-agent.ts
index 504e8c0f64c..d896ba7c75a 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/standard-agents/agents/data-manipulator-agent.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/standard-agents/agents/data-manipulator-agent.ts
@@ -1,5 +1,5 @@
+import { DEFAULT_SMART_MODEL } from 'src/engine/metadata-modules/ai/ai-models/constants/ai-models.const';
 import { type StandardAgentDefinition } from 'src/engine/workspace-manager/workspace-sync-metadata/standard-agents/types/standard-agent-definition.interface';
-import { DEFAULT_SMART_MODEL } from 'src/engine/metadata-modules/ai-models/constants/ai-models.const';
 import { DATA_MANIPULATOR_ROLE } from 'src/engine/workspace-manager/workspace-sync-metadata/standard-roles/roles/data-manipulator-role';
 
 export const DATA_MANIPULATOR_AGENT: StandardAgentDefinition = {
@@ -44,4 +44,5 @@ Prioritize data integrity and provide clear feedback on operations performed.`,
   isCustom: false,
   standardRoleId: DATA_MANIPULATOR_ROLE.standardId,
   modelConfiguration: {},
+  evaluationInputs: [],
 };
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/standard-agents/agents/helper-agent.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/standard-agents/agents/helper-agent.ts
index 0e165838669..b67fa1dc0f4 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/standard-agents/agents/helper-agent.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/standard-agents/agents/helper-agent.ts
@@ -1,4 +1,4 @@
-import { DEFAULT_SMART_MODEL } from 'src/engine/metadata-modules/ai-models/constants/ai-models.const';
+import { DEFAULT_SMART_MODEL } from 'src/engine/metadata-modules/ai/ai-models/constants/ai-models.const';
 import { type StandardAgentDefinition } from 'src/engine/workspace-manager/workspace-sync-metadata/standard-agents/types/standard-agent-definition.interface';
 
 export const HELPER_AGENT: StandardAgentDefinition = {
@@ -36,4 +36,5 @@ Always base answers on official Twenty documentation. Be patient and helpful.`,
   responseFormat: { type: 'text' },
   isCustom: false,
   modelConfiguration: {},
+  evaluationInputs: [],
 };
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/standard-agents/agents/researcher-agent.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/standard-agents/agents/researcher-agent.ts
index 2609a08aba6..6502464a4bd 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/standard-agents/agents/researcher-agent.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/standard-agents/agents/researcher-agent.ts
@@ -1,5 +1,5 @@
+import { DEFAULT_SMART_MODEL } from 'src/engine/metadata-modules/ai/ai-models/constants/ai-models.const';
 import { type StandardAgentDefinition } from 'src/engine/workspace-manager/workspace-sync-metadata/standard-agents/types/standard-agent-definition.interface';
-import { DEFAULT_SMART_MODEL } from 'src/engine/metadata-modules/ai-models/constants/ai-models.const';
 
 export const RESEARCHER_AGENT: StandardAgentDefinition = {
   standardId: '20202020-0002-0001-0001-000000000005',
@@ -39,4 +39,5 @@ Be persistent in finding accurate information.`,
       enabled: true,
     },
   },
+  evaluationInputs: [],
 };
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/standard-agents/agents/workflow-builder-agent.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/standard-agents/agents/workflow-builder-agent.ts
index e25e5fb10b0..53b61cdcfa4 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/standard-agents/agents/workflow-builder-agent.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/standard-agents/agents/workflow-builder-agent.ts
@@ -1,5 +1,5 @@
+import { DEFAULT_SMART_MODEL } from 'src/engine/metadata-modules/ai/ai-models/constants/ai-models.const';
 import { type StandardAgentDefinition } from 'src/engine/workspace-manager/workspace-sync-metadata/standard-agents/types/standard-agent-definition.interface';
-import { DEFAULT_SMART_MODEL } from 'src/engine/metadata-modules/ai-models/constants/ai-models.const';
 import { WORKFLOW_MANAGER_ROLE } from 'src/engine/workspace-manager/workspace-sync-metadata/standard-roles/roles/workflow-manager-role';
 
 export const WORKFLOW_BUILDER_AGENT: StandardAgentDefinition = {
@@ -22,6 +22,26 @@ Key concepts:
 - Data flow: Use {{stepId.fieldName}} to reference previous step outputs
 - Relationships: Use nested objects like {"company": {"id": "{{reference}}"}}
 
+CRON Trigger Settings Schema:
+ For CRON triggers, settings.type must be one of these exact values:
+1. "DAYS" - Daily schedule
+   - Requires: schedule: { day: number (1+), hour: number (0-23), minute: number (0-59) }
+   - Example: { type: "DAYS", schedule: { day: 1, hour: 9, minute: 0 }, outputSchema: {} }
+
+2. "HOURS" - Hourly schedule (USE THIS FOR "EVERY HOUR")
+   - Requires: schedule: { hour: number (1+), minute: number (0-59) }
+   - Example: { type: "HOURS", schedule: { hour: 1, minute: 0 }, outputSchema: {} }
+   - This runs every X hours at Y minutes past the hour
+
+3. "MINUTES" - Minute-based schedule
+   - Requires: schedule: { minute: number (1+) }
+   - Example: { type: "MINUTES", schedule: { minute: 15 }, outputSchema: {} }
+
+4. "CUSTOM" - Custom cron pattern
+   - Requires: pattern: string (cron expression)
+   - Example: { type: "CUSTOM", pattern: "0 * * * *", outputSchema: {} }
+
+
 Critical: Always rely on tool schema definitions
 - The workflow creation tool provides comprehensive schemas with examples
 - Follow schema definitions exactly for field names, types, and structures
@@ -41,4 +61,30 @@ Prioritize user understanding and workflow effectiveness.`,
   standardRoleId: WORKFLOW_MANAGER_ROLE.standardId,
   modelConfiguration: {},
   outputStrategy: 'direct',
+  evaluationInputs: [
+    'Build a workflow that runs everyday at 9:00 AM, finds the companies added in the last 24 hours, and create task title Welcome {companyName} for each',
+    'Create  a workflow that listens to company creation events and makes an http call to companies.twenty.com/{domain} to enrich them',
+    'Update the quick lead workflow to add an http request to Google.com as the last step',
+    'when a new lead is created, automatically send an email to the sales team with the lead details',
+    'I need a workflow that runs every monday morning and creates a weekly summary report of all closed deals',
+    'can you make a workflow to automatically assign new oppurtunities to sales reps based on territory?',
+    'create workflow that updates contact status to inactive if theres no activity for 90 days',
+    'Build automation to send followup email 3 days after first contact with prospect',
+    'i want to automatically create a task for account manager when deal reaches negotiation stage',
+    'setup a workflow that enriches company data from clearbit when new account is created',
+    'make a workflow to notify slack channel when deal amount is over $50k',
+    'need workflow that runs daily and finds all overdue tasks then sends reminder emails',
+    'Create automation to update lead score when contact opens email or clicks link',
+    'workflow to automatically create renewal opportunity 60 days before contract end date',
+    'can you build a flow that copies contact info to company record when deal is won?',
+    'I need to send a survey email 7 days after deal closes',
+    'make workflow that assigns leads round-robin style to available sales reps',
+    'create automation to tag contacts as "hot lead" when they visit pricing page 3 times',
+    'workflow that escalates support tickets to manager if not resolved in 48 hours',
+    'need a workflow to sync new contacts to mailchimp mailing list',
+    'build flow that updates deal stage to lost if no activity for 30 days',
+    'create workflow that sends birthday email to contacts on thier birthday',
+    'can i get a workflow that creates calendar event when meeting is scheduled with prospect',
+    'workflow to automatically generate quote pdf when opportunity moves to proposal stage',
+  ],
 };
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/standard-agents/index.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/standard-agents/index.ts
index b2ca64b401b..d43fbd93b9d 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/standard-agents/index.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/standard-agents/index.ts
@@ -1,3 +1,4 @@
+import { DASHBOARD_BUILDER_AGENT } from './agents/dashboard-builder-agent';
 import { DATA_MANIPULATOR_AGENT } from './agents/data-manipulator-agent';
 import { HELPER_AGENT } from './agents/helper-agent';
 import { RESEARCHER_AGENT } from './agents/researcher-agent';
@@ -7,6 +8,7 @@ import { type StandardAgentDefinition } from './types/standard-agent-definition.
 export const standardAgentDefinitions = [
   WORKFLOW_BUILDER_AGENT,
   DATA_MANIPULATOR_AGENT,
+  DASHBOARD_BUILDER_AGENT,
   HELPER_AGENT,
   RESEARCHER_AGENT,
   // CODE_AGENT,
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/standard-roles/index.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/standard-roles/index.ts
index 893b461b23e..92d3b7feb6c 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/standard-roles/index.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/standard-roles/index.ts
@@ -1,4 +1,5 @@
 import { ADMIN_ROLE } from './roles/admin-role';
+import { DASHBOARD_MANAGER_ROLE } from './roles/dashboard-manager-role';
 import { DATA_MANIPULATOR_ROLE } from './roles/data-manipulator-role';
 import { WORKFLOW_MANAGER_ROLE } from './roles/workflow-manager-role';
 import { type StandardRoleDefinition } from './types/standard-role-definition.interface';
@@ -7,4 +8,5 @@ export const standardRoleDefinitions = [
   ADMIN_ROLE,
   WORKFLOW_MANAGER_ROLE,
   DATA_MANIPULATOR_ROLE,
+  DASHBOARD_MANAGER_ROLE,
 ] as const satisfies StandardRoleDefinition[];
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/standard-roles/roles/dashboard-manager-role.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/standard-roles/roles/dashboard-manager-role.ts
new file mode 100644
index 00000000000..7e8e4c049ef
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/standard-roles/roles/dashboard-manager-role.ts
@@ -0,0 +1,21 @@
+import { PermissionFlagType } from 'src/engine/metadata-modules/permissions/constants/permission-flag-type.constants';
+import { type StandardRoleDefinition } from 'src/engine/workspace-manager/workspace-sync-metadata/standard-roles/types/standard-role-definition.interface';
+
+export const DASHBOARD_MANAGER_ROLE: StandardRoleDefinition = {
+  standardId: '20202020-0001-0001-0001-000000000005',
+  label: 'Dashboard Manager',
+  description: 'Role for creating and managing dashboards',
+  icon: 'IconLayoutDashboard',
+  isEditable: false,
+  canUpdateAllSettings: false,
+  canAccessAllTools: false,
+  canReadAllObjectRecords: true,
+  canUpdateAllObjectRecords: true,
+  canSoftDeleteAllObjectRecords: false,
+  canDestroyAllObjectRecords: false,
+  canBeAssignedToUsers: false,
+  canBeAssignedToAgents: true,
+  canBeAssignedToApiKeys: false,
+  permissionFlags: [PermissionFlagType.LAYOUTS],
+  applicationId: null, // TODO: Replace with Twenty application ID
+};
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/standard-roles/roles/workflow-manager-role.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/standard-roles/roles/workflow-manager-role.ts
index dd8150a3d3a..2fbaf28f7c6 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/standard-roles/roles/workflow-manager-role.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/standard-roles/roles/workflow-manager-role.ts
@@ -8,8 +8,8 @@ export const WORKFLOW_MANAGER_ROLE: StandardRoleDefinition = {
   icon: 'IconSettingsAutomation',
   isEditable: false,
   canUpdateAllSettings: false,
-  canAccessAllTools: true,
-  canReadAllObjectRecords: true,
+  canAccessAllTools: false,
+  canReadAllObjectRecords: false,
   canUpdateAllObjectRecords: true,
   canSoftDeleteAllObjectRecords: false,
   canDestroyAllObjectRecords: false,
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/workspace-sync-metadata.module.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/workspace-sync-metadata.module.ts
index 2414ddffb0d..74b4e5351b7 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/workspace-sync-metadata.module.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/workspace-sync-metadata.module.ts
@@ -5,7 +5,7 @@ import { ApplicationModule } from 'src/engine/core-modules/application/applicati
 import { FeatureFlagEntity } from 'src/engine/core-modules/feature-flag/feature-flag.entity';
 import { FeatureFlagModule } from 'src/engine/core-modules/feature-flag/feature-flag.module';
 import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
-import { AiAgentRoleModule } from 'src/engine/metadata-modules/ai-agent-role/ai-agent-role.module';
+import { AiAgentRoleModule } from 'src/engine/metadata-modules/ai/ai-agent-role/ai-agent-role.module';
 import { DataSourceModule } from 'src/engine/metadata-modules/data-source/data-source.module';
 import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { WorkspaceManyOrAllFlatEntityMapsCacheModule } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.module';
diff --git a/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-schema/workflow-schema.module.ts b/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-schema/workflow-schema.module.ts
index ae9e478502f..3e0c29e5f7f 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-schema/workflow-schema.module.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-schema/workflow-schema.module.ts
@@ -2,7 +2,7 @@ import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
 
 import { FeatureFlagModule } from 'src/engine/core-modules/feature-flag/feature-flag.module';
-import { AgentEntity } from 'src/engine/metadata-modules/ai-agent/entities/agent.entity';
+import { AgentEntity } from 'src/engine/metadata-modules/ai/ai-agent/entities/agent.entity';
 import { WorkflowCommonModule } from 'src/modules/workflow/common/workflow-common.module';
 import { WorkflowSchemaWorkspaceService } from 'src/modules/workflow/workflow-builder/workflow-schema/workflow-schema.workspace-service';
 
diff --git a/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-schema/workflow-schema.workspace-service.ts b/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-schema/workflow-schema.workspace-service.ts
index ed984f8176a..9d8eb939310 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-schema/workflow-schema.workspace-service.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-schema/workflow-schema.workspace-service.ts
@@ -16,7 +16,7 @@ import { Repository } from 'typeorm';
 
 import { type DatabaseEventAction } from 'src/engine/api/graphql/graphql-query-runner/enums/database-event-action';
 import { checkStringIsDatabaseEventAction } from 'src/engine/api/graphql/graphql-query-runner/utils/check-string-is-database-event-action';
-import { AgentEntity } from 'src/engine/metadata-modules/ai-agent/entities/agent.entity';
+import { AgentEntity } from 'src/engine/metadata-modules/ai/ai-agent/entities/agent.entity';
 import { generateFakeValue } from 'src/engine/utils/generate-fake-value';
 import { WorkflowCommonWorkspaceService } from 'src/modules/workflow/common/workspace-services/workflow-common.workspace-service';
 import { DEFAULT_ITERATOR_CURRENT_ITEM } from 'src/modules/workflow/workflow-builder/workflow-schema/constants/default-iterator-current-item.const';
diff --git a/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-version-step/__tests__/workflow-version-step-operations.workspace-service.spec.ts b/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-version-step/__tests__/workflow-version-step-operations.workspace-service.spec.ts
index a75734a3600..b24381452ef 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-version-step/__tests__/workflow-version-step-operations.workspace-service.spec.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-version-step/__tests__/workflow-version-step-operations.workspace-service.spec.ts
@@ -1,7 +1,7 @@
 import { Test, type TestingModule } from '@nestjs/testing';
 import { getRepositoryToken } from '@nestjs/typeorm';
 
-import { AgentEntity } from 'src/engine/metadata-modules/ai-agent/entities/agent.entity';
+import { AgentEntity } from 'src/engine/metadata-modules/ai/ai-agent/entities/agent.entity';
 import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
 import { type ServerlessFunctionEntity } from 'src/engine/metadata-modules/serverless-function/serverless-function.entity';
 import { ServerlessFunctionService } from 'src/engine/metadata-modules/serverless-function/serverless-function.service';
diff --git a/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-version-step/workflow-version-step-operations.workspace-service.ts b/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-version-step/workflow-version-step-operations.workspace-service.ts
index 46d317e2bfd..de49125db6b 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-version-step/workflow-version-step-operations.workspace-service.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-version-step/workflow-version-step-operations.workspace-service.ts
@@ -8,8 +8,8 @@ import { v4 } from 'uuid';
 
 import { BASE_TYPESCRIPT_PROJECT_INPUT_SCHEMA } from 'src/engine/core-modules/serverless/drivers/constants/base-typescript-project-input-schema';
 import { type WorkflowStepPositionInput } from 'src/engine/core-modules/workflow/dtos/update-workflow-step-position-input.dto';
-import { AgentEntity } from 'src/engine/metadata-modules/ai-agent/entities/agent.entity';
-import { DEFAULT_SMART_MODEL } from 'src/engine/metadata-modules/ai-models/constants/ai-models.const';
+import { AgentEntity } from 'src/engine/metadata-modules/ai/ai-agent/entities/agent.entity';
+import { DEFAULT_SMART_MODEL } from 'src/engine/metadata-modules/ai/ai-models/constants/ai-models.const';
 import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
 import { ServerlessFunctionService } from 'src/engine/metadata-modules/serverless-function/serverless-function.service';
 import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.manager';
diff --git a/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-version-step/workflow-version-step.module.ts b/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-version-step/workflow-version-step.module.ts
index a40d1411d65..d3ec03edad6 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-version-step/workflow-version-step.module.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-version-step/workflow-version-step.module.ts
@@ -2,17 +2,17 @@ import { Module } from '@nestjs/common';
 
 import { NestjsQueryTypeOrmModule } from '@ptc-org/nestjs-query-typeorm';
 
-import { AgentEntity } from 'src/engine/metadata-modules/ai-agent/entities/agent.entity';
+import { AgentEntity } from 'src/engine/metadata-modules/ai/ai-agent/entities/agent.entity';
 import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
 import { ServerlessFunctionModule } from 'src/engine/metadata-modules/serverless-function/serverless-function.module';
 import { WorkflowCommonModule } from 'src/modules/workflow/common/workflow-common.module';
 import { WorkflowSchemaModule } from 'src/modules/workflow/workflow-builder/workflow-schema/workflow-schema.module';
-import { WorkflowVersionStepOperationsWorkspaceService } from 'src/modules/workflow/workflow-builder/workflow-version-step/workflow-version-step-operations.workspace-service';
-import { WorkflowVersionStepWorkspaceService } from 'src/modules/workflow/workflow-builder/workflow-version-step/workflow-version-step.workspace-service';
-import { WorkflowVersionStepHelpersWorkspaceService } from 'src/modules/workflow/workflow-builder/workflow-version-step/workflow-version-step-helpers.workspace-service';
 import { WorkflowVersionStepCreationWorkspaceService } from 'src/modules/workflow/workflow-builder/workflow-version-step/workflow-version-step-creation.workspace-service';
-import { WorkflowVersionStepUpdateWorkspaceService } from 'src/modules/workflow/workflow-builder/workflow-version-step/workflow-version-step-update.workspace-service';
 import { WorkflowVersionStepDeletionWorkspaceService } from 'src/modules/workflow/workflow-builder/workflow-version-step/workflow-version-step-deletion.workspace-service';
+import { WorkflowVersionStepHelpersWorkspaceService } from 'src/modules/workflow/workflow-builder/workflow-version-step/workflow-version-step-helpers.workspace-service';
+import { WorkflowVersionStepOperationsWorkspaceService } from 'src/modules/workflow/workflow-builder/workflow-version-step/workflow-version-step-operations.workspace-service';
+import { WorkflowVersionStepUpdateWorkspaceService } from 'src/modules/workflow/workflow-builder/workflow-version-step/workflow-version-step-update.workspace-service';
+import { WorkflowVersionStepWorkspaceService } from 'src/modules/workflow/workflow-builder/workflow-version-step/workflow-version-step.workspace-service';
 
 @Module({
   imports: [
diff --git a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/ai-agent/ai-agent-action.module.ts b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/ai-agent/ai-agent-action.module.ts
index 8318ee6097f..bb004e3edb0 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/ai-agent/ai-agent-action.module.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/ai-agent/ai-agent-action.module.ts
@@ -1,26 +1,22 @@
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
 
-import { AiBillingModule } from 'src/engine/metadata-modules/ai-billing/ai-billing.module';
-import { AiModelsModule } from 'src/engine/metadata-modules/ai-models/ai-models.module';
-import { AiToolsModule } from 'src/engine/metadata-modules/ai-tools/ai-tools.module';
 import { UserWorkspaceModule } from 'src/engine/core-modules/user-workspace/user-workspace.module';
-import { AgentEntity } from 'src/engine/metadata-modules/ai-agent/entities/agent.entity';
-import { RoleTargetsEntity } from 'src/engine/metadata-modules/role/role-targets.entity';
+import { AiAgentExecutionModule } from 'src/engine/metadata-modules/ai/ai-agent-execution/ai-agent-execution.module';
+import { AgentEntity } from 'src/engine/metadata-modules/ai/ai-agent/entities/agent.entity';
+import { AiBillingModule } from 'src/engine/metadata-modules/ai/ai-billing/ai-billing.module';
 import { UserRoleModule } from 'src/engine/metadata-modules/user-role/user-role.module';
 import { ScopedWorkspaceContextFactory } from 'src/engine/twenty-orm/factories/scoped-workspace-context.factory';
 import { WorkflowExecutionContextService } from 'src/modules/workflow/workflow-executor/services/workflow-execution-context.service';
-import { AiAgentExecutorService } from 'src/modules/workflow/workflow-executor/workflow-actions/ai-agent/services/ai-agent-executor.service';
 import { WorkflowRunModule } from 'src/modules/workflow/workflow-runner/workflow-run/workflow-run.module';
 
 import { AiAgentWorkflowAction } from './ai-agent.workflow-action';
 
 @Module({
   imports: [
+    AiAgentExecutionModule,
     AiBillingModule,
-    AiModelsModule,
-    AiToolsModule,
-    TypeOrmModule.forFeature([AgentEntity, RoleTargetsEntity]),
+    TypeOrmModule.forFeature([AgentEntity]),
     WorkflowRunModule,
     UserWorkspaceModule,
     UserRoleModule,
@@ -29,7 +25,6 @@ import { AiAgentWorkflowAction } from './ai-agent.workflow-action';
     ScopedWorkspaceContextFactory,
     WorkflowExecutionContextService,
     AiAgentWorkflowAction,
-    AiAgentExecutorService,
   ],
   exports: [AiAgentWorkflowAction],
 })
diff --git a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/ai-agent/ai-agent.workflow-action.ts b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/ai-agent/ai-agent.workflow-action.ts
index 6a852337236..971ee6ecd9a 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/ai-agent/ai-agent.workflow-action.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/ai-agent/ai-agent.workflow-action.ts
@@ -6,12 +6,14 @@ import { Repository } from 'typeorm';
 
 import { type WorkflowAction } from 'src/modules/workflow/workflow-executor/interfaces/workflow-action.interface';
 
-import { AIBillingService } from 'src/engine/metadata-modules/ai-billing/services/ai-billing.service';
-import { AgentEntity } from 'src/engine/metadata-modules/ai-agent/entities/agent.entity';
+import { AgentAsyncExecutorService } from 'src/engine/metadata-modules/ai/ai-agent-execution/services/agent-async-executor.service';
 import {
   AgentException,
   AgentExceptionCode,
-} from 'src/engine/metadata-modules/ai-agent/agent.exception';
+} from 'src/engine/metadata-modules/ai/ai-agent/agent.exception';
+import { AgentEntity } from 'src/engine/metadata-modules/ai/ai-agent/entities/agent.entity';
+import { AIBillingService } from 'src/engine/metadata-modules/ai/ai-billing/services/ai-billing.service';
+import { DEFAULT_SMART_MODEL } from 'src/engine/metadata-modules/ai/ai-models/constants/ai-models.const';
 import {
   WorkflowStepExecutorException,
   WorkflowStepExecutorExceptionCode,
@@ -20,15 +22,13 @@ import { WorkflowExecutionContextService } from 'src/modules/workflow/workflow-e
 import { type WorkflowActionInput } from 'src/modules/workflow/workflow-executor/types/workflow-action-input';
 import { type WorkflowActionOutput } from 'src/modules/workflow/workflow-executor/types/workflow-action-output.type';
 import { findStepOrThrow } from 'src/modules/workflow/workflow-executor/utils/find-step-or-throw.util';
-import { AiAgentExecutorService } from 'src/modules/workflow/workflow-executor/workflow-actions/ai-agent/services/ai-agent-executor.service';
-import { DEFAULT_SMART_MODEL } from 'src/engine/metadata-modules/ai-models/constants/ai-models.const';
 
 import { isWorkflowAiAgentAction } from './guards/is-workflow-ai-agent-action.guard';
 
 @Injectable()
 export class AiAgentWorkflowAction implements WorkflowAction {
   constructor(
-    private readonly aiAgentExecutionService: AiAgentExecutorService,
+    private readonly aiAgentExecutionService: AgentAsyncExecutorService,
     private readonly aiBillingService: AIBillingService,
     private readonly workflowExecutionContextService: WorkflowExecutionContextService,
     @InjectRepository(AgentEntity)
diff --git a/packages/twenty-server/test/integration/graphql/suites/agent/agent.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/agent/agent.integration-spec.ts
index 3abe712f614..23c90b1e331 100644
--- a/packages/twenty-server/test/integration/graphql/suites/agent/agent.integration-spec.ts
+++ b/packages/twenty-server/test/integration/graphql/suites/agent/agent.integration-spec.ts
@@ -1,21 +1,18 @@
 import { Test, type TestingModule } from '@nestjs/testing';
 import { getRepositoryToken } from '@nestjs/typeorm';
 
-import { AiAgentRoleService } from 'src/engine/metadata-modules/ai-agent-role/ai-agent-role.service';
-import { AgentChatService } from 'src/engine/metadata-modules/ai-chat/services/agent-chat.service';
-import { AgentEntity } from 'src/engine/metadata-modules/ai-agent/entities/agent.entity';
+import { AiAgentRoleService } from 'src/engine/metadata-modules/ai/ai-agent-role/ai-agent-role.service';
 import {
   AgentException,
   AgentExceptionCode,
-} from 'src/engine/metadata-modules/ai-agent/agent.exception';
-import { AgentResolver } from 'src/engine/metadata-modules/ai-agent/agent.resolver';
-import { AgentService } from 'src/engine/metadata-modules/ai-agent/agent.service';
+} from 'src/engine/metadata-modules/ai/ai-agent/agent.exception';
+import { AgentResolver } from 'src/engine/metadata-modules/ai/ai-agent/agent.resolver';
+import { AgentService } from 'src/engine/metadata-modules/ai/ai-agent/agent.service';
+import { AgentEntity } from 'src/engine/metadata-modules/ai/ai-agent/entities/agent.entity';
+import { AgentChatService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-chat.service';
 import { PermissionsService } from 'src/engine/metadata-modules/permissions/permissions.service';
 import { RoleTargetsEntity } from 'src/engine/metadata-modules/role/role-targets.entity';
 
-// Mock the agent service
-jest.mock('../../../../../src/engine/metadata-modules/ai-agent/agent.service');
-
 // Mock the guards and decorators
 jest.mock('../../../../../src/engine/guards/feature-flag.guard', () => ({
   FeatureFlagGuard: jest.fn().mockImplementation(() => ({
diff --git a/packages/twenty-server/test/integration/metadata/suites/agent/agent-tool.service.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/agent/agent-tool.service.integration-spec.ts
index 97982663519..305cb4cfe5f 100644
--- a/packages/twenty-server/test/integration/metadata/suites/agent/agent-tool.service.integration-spec.ts
+++ b/packages/twenty-server/test/integration/metadata/suites/agent/agent-tool.service.integration-spec.ts
@@ -55,14 +55,13 @@ describe('AgentToolGeneratorService Integration', () => {
       );
 
       expect(tools).toBeDefined();
-      expect(Object.keys(tools)).toHaveLength(7);
+      expect(Object.keys(tools)).toHaveLength(6);
       expect(Object.keys(tools)).toContain('create_testObject');
       expect(Object.keys(tools)).toContain('update_testObject');
       expect(Object.keys(tools)).toContain('find_testObject');
       expect(Object.keys(tools)).toContain('find_one_testObject');
       expect(Object.keys(tools)).toContain('soft_delete_testObject');
       expect(Object.keys(tools)).toContain('soft_delete_many_testObject');
-      expect(Object.keys(tools)).toContain('http_request');
     });
 
     it('should generate read-only tools for agent with read permissions only', async () => {
@@ -100,22 +99,20 @@ describe('AgentToolGeneratorService Integration', () => {
       );
 
       expect(tools).toBeDefined();
-      expect(Object.keys(tools)).toHaveLength(3);
+      expect(Object.keys(tools)).toHaveLength(2);
       expect(Object.keys(tools)).toContain('find_testObject');
       expect(Object.keys(tools)).toContain('find_one_testObject');
-      expect(Object.keys(tools)).toContain('http_request');
       expect(Object.keys(tools)).not.toContain('create_testObject');
       expect(Object.keys(tools)).not.toContain('update_testObject');
     });
 
-    it('should return only http request tool for agent without role', async () => {
+    it('should return no tool for agent without role', async () => {
       const tools = await context.agentToolService.generateToolsForAgent(
         context.testAgentId,
         context.testWorkspaceId,
       );
 
-      expect(Object.keys(tools)).toHaveLength(1);
-      expect(Object.keys(tools)).toContain('http_request');
+      expect(Object.keys(tools)).toHaveLength(0);
     });
 
     it('should filter out workflow-run objects', async () => {
@@ -158,7 +155,7 @@ describe('AgentToolGeneratorService Integration', () => {
         [context.testRoleId],
       );
 
-      expect(Object.keys(tools)).toHaveLength(7);
+      expect(Object.keys(tools)).toHaveLength(6);
     });
   });
 });
diff --git a/packages/twenty-server/test/integration/metadata/suites/agent/utils/agent-tool-test-utils.ts b/packages/twenty-server/test/integration/metadata/suites/agent/utils/agent-tool-test-utils.ts
index 29d592e1c6e..24c7bc6e2b7 100644
--- a/packages/twenty-server/test/integration/metadata/suites/agent/utils/agent-tool-test-utils.ts
+++ b/packages/twenty-server/test/integration/metadata/suites/agent/utils/agent-tool-test-utils.ts
@@ -13,11 +13,11 @@ import { ToolRegistryService } from 'src/engine/core-modules/tool/services/tool-
 import { SearchArticlesTool } from 'src/engine/core-modules/tool/tools/search-articles-tool/search-articles-tool';
 import { SendEmailTool } from 'src/engine/core-modules/tool/tools/send-email-tool/send-email-tool';
 import { TwentyConfigService } from 'src/engine/core-modules/twenty-config/twenty-config.service';
-import { AgentService } from 'src/engine/metadata-modules/ai-agent/agent.service';
-import { AgentEntity } from 'src/engine/metadata-modules/ai-agent/entities/agent.entity';
-import { AgentToolGeneratorService } from 'src/engine/metadata-modules/ai-agent/services/agent-tool-generator.service';
-import { ToolAdapterService } from 'src/engine/metadata-modules/ai-tools/services/tool-adapter.service';
-import { ToolService } from 'src/engine/metadata-modules/ai-tools/services/tool.service';
+import { AgentService } from 'src/engine/metadata-modules/ai/ai-agent/agent.service';
+import { AgentEntity } from 'src/engine/metadata-modules/ai/ai-agent/entities/agent.entity';
+import { AgentToolGeneratorService } from 'src/engine/metadata-modules/ai/ai-agent/services/agent-tool-generator.service';
+import { ToolAdapterService } from 'src/engine/metadata-modules/ai/ai-tools/services/tool-adapter.service';
+import { ToolService } from 'src/engine/metadata-modules/ai/ai-tools/services/tool.service';
 import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service';
 import { ObjectMetadataServiceV2 } from 'src/engine/metadata-modules/object-metadata/object-metadata-v2.service';
 import { type ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
@@ -227,6 +227,7 @@ export const createAgentToolTestModule =
       description: 'Test agent for integration tests',
       prompt: 'You are a test agent',
       modelId: 'gpt-4o',
+      evaluationInputs: [],
       responseFormat: { type: 'text' },
       workspaceId: testWorkspaceId,
       workspace: {} as any,
diff --git a/packages/twenty-shared/src/types/SettingsPath.ts b/packages/twenty-shared/src/types/SettingsPath.ts
index a097c78a06a..31bee589e86 100644
--- a/packages/twenty-shared/src/types/SettingsPath.ts
+++ b/packages/twenty-shared/src/types/SettingsPath.ts
@@ -29,6 +29,7 @@ export enum SettingsPath {
   AI = 'ai',
   AINewAgent = 'ai/new-agent',
   AIAgentDetail = 'ai/agents/:agentId',
+  AIAgentTurnDetail = 'ai/agents/:agentId/turns/:turnId',
   Applications = 'applications',
   ApplicationDetail = 'applications/:applicationId',
   ApplicationServerlessFunctionDetail = 'applications/:applicationId/:serverlessFunctionId',