The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Derive an agent run's turn author with its execution context (#27537)
Félix Malfaitb0d1bd474884
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/__tests__/agent-run.service.spec.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/__tests__/agent-run.service.spec.tsindex 5297731da5c..9b2fc853c64 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/__tests__/agent-run.service.spec.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/__tests__/agent-run.service.spec.ts@@ -99,7 +99,7 @@ describe('AgentRunService', () => {});expect(secondResult.threadId).not.toBe(result.threadId);- const { conversation, spec, prompt, executionContext, resolveCreatedBy } =+ const { conversation, spec, prompt, executionContext } =runInput(agentRunnerService);expect(conversation).toEqual({@@ -121,9 +121,7 @@ describe('AgentRunService', () => {expect(executionContext).toMatchObject({rolePermissionConfig: { intersectionOf: ['agent-role-id'] },conversationActor: { type: 'application', applicationId: APPLICATION.id },- });- await expect(resolveCreatedBy()).resolves.toMatchObject({- source: 'APPLICATION',+ turnCreatedBy: { source: 'APPLICATION' },});});@@ -164,7 +162,7 @@ describe('AgentRunService', () => {runAsWorkspaceMemberId: 'workspace-member-id',});- const { conversation, caller, prompt, executionContext, resolveCreatedBy } =+ const { conversation, caller, prompt, executionContext } =runInput(agentRunnerService);expect(result.threadId).toBe(threadId);@@ -181,9 +179,9 @@ describe('AgentRunService', () => {expect(prompt).toMatchObject({senderUserWorkspaceId: RUN_AS_USER_WORKSPACE_ID,});- await expect(resolveCreatedBy()).resolves.toEqual(RUN_AS_ACTOR);expect(executionContext).toMatchObject({actorContext: RUN_AS_ACTOR,+ turnCreatedBy: RUN_AS_ACTOR,userWorkspaceId: RUN_AS_USER_WORKSPACE_ID,runAsRoleId: 'role-id',rolePermissionConfig: { intersectionOf: ['role-id'] },diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/__tests__/agent-runner.service.spec.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/__tests__/agent-runner.service.spec.tsindex c3f7c2386e3..adf59cd8866 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/__tests__/agent-runner.service.spec.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/__tests__/agent-runner.service.spec.ts@@ -10,7 +10,7 @@ const CREATED_BY = {name: 'New deals',workspaceMemberId: null,context: {},-} as Awaited<ReturnType<AgentRunnerRunInput['resolveCreatedBy']>>;+} as AgentRunnerRunInput['executionContext']['turnCreatedBy'];const PRIOR_MESSAGES = [{ id: 'message-id', role: 'assistant', parts: [] }];@@ -71,9 +71,9 @@ const RUN_INPUT: AgentRunnerRunInput = {userWorkspaceId: 'user-workspace-id',rolePermissionConfig: { intersectionOf: [] },conversationActor: { type: 'application', applicationId: 'app-id' },+ turnCreatedBy: CREATED_BY,usageOperationType: UsageOperationType.AI_WORKFLOW_TOKEN,},- resolveCreatedBy: async () => CREATED_BY,};const buildService = (execution = buildExecution()) => {@@ -214,41 +214,23 @@ describe('AgentRunnerService', () => {);});- it.each([- [- 'the turn author cannot be resolved',- { resolveCreatedBy: jest.fn().mockRejectedValue(new Error('gone')) },- {},- ],- [- 'the turn cannot be opened',- {},- { openTurn: jest.fn().mockRejectedValue(new Error('db down')) },- ],- ])(- 'still runs the agent when %s',- async (_, inputOverrides, conversationOverrides) => {- const {- service,- agentAsyncExecutorService,- agentRunConversationService,- } = buildService();+ it('still runs the agent when the turn cannot be opened', async () => {+ const { service, agentAsyncExecutorService, agentRunConversationService } =+ buildService();- Object.assign(agentRunConversationService, conversationOverrides);+ agentRunConversationService.openTurn.mockRejectedValue(+ new Error('db down'),+ );- const { outcome } = await service.run({- ...RUN_INPUT,- ...inputOverrides,- });+ const { outcome } = await service.run(RUN_INPUT);- expect(agentAsyncExecutorService.executeAgent).toHaveBeenCalled();- expect(agentRunConversationService.closeTurn).not.toHaveBeenCalled();- expect(outcome).toEqual({- status: 'COMPLETED',- result: { answer: 'done' },- });- },- );+ expect(agentAsyncExecutorService.executeAgent).toHaveBeenCalled();+ expect(agentRunConversationService.closeTurn).not.toHaveBeenCalled();+ expect(outcome).toEqual({+ status: 'COMPLETED',+ result: { answer: 'done' },+ });+ });it('fails the turn of a run that throws', async () => {const { service, agentAsyncExecutorService, agentRunConversationService } =diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/agent-run.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/agent-run.service.tsindex 85bd0c5e1db..4e88f1a6b77 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/agent-run.service.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/agent-run.service.ts@@ -214,7 +214,6 @@ export class AgentRunServiceworkspaceId: workspace.id,caller,}),- resolveCreatedBy: async () => caller.ref.createdBy,});return {@@ -281,6 +280,7 @@ export class AgentRunServicereturn {authContext: runAsContext?.authContext ?? agentContext.authContext,actorContext: runAsContext?.actorContext,+ turnCreatedBy: ref.createdBy,userWorkspaceId:runAsContext?.authContext.userWorkspaceId ?? ref.requestUserWorkspaceId,rolePermissionConfig: buildAgentRolePermissionConfig({@@ -298,12 +298,6 @@ export class AgentRunService};}- async resolveTurnAuthor({- caller,- }: AgentRunCallerInput<AgentApiRunCaller>): Promise<ActorMetadata> {- return caller.ref.createdBy;- }-async getWaitingState({workspaceId,caller,diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/agent-runner.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/agent-runner.service.tsindex e0c393ecb6e..3885ac28825 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/agent-runner.service.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/agent-runner.service.ts@@ -136,8 +136,6 @@ export class AgentRunnerService {workspaceId,caller,}),- resolveCreatedBy: () =>- handler.resolveTurnAuthor({ workspaceId, caller }),},suspension,});@@ -215,7 +213,7 @@ export class AgentRunnerService {const turnId = await this.tryRecording(`record the agent turn in thread ${threadId}`,- async () =>+ () =>this.agentRunConversationService.openTurn({workspaceId,threadId,@@ -223,7 +221,7 @@ export class AgentRunnerService {agentId,senderUserWorkspaceId: prompt?.senderUserWorkspaceId ?? null,senderApplicationId: prompt?.senderApplicationId ?? null,- createdBy: await input.resolveCreatedBy(),+ createdBy: executionContext.turnCreatedBy,messages: prompt?.messages ?? [],}),);diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/types/agent-run-caller-handler.type.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/types/agent-run-caller-handler.type.tsindex b795c9d76c7..8d69b798c48 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/types/agent-run-caller-handler.type.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/types/agent-run-caller-handler.type.ts@@ -1,5 +1,4 @@import { type AgentRunSummary } from 'twenty-shared/ai';-import { type ActorMetadata } from 'twenty-shared/types';import { type AgentRunCaller } from 'src/engine/metadata-modules/ai/ai-agent-execution/types/agent-run-caller.type';import { type AgentRunCallerInput } from 'src/engine/metadata-modules/ai/ai-agent-execution/types/agent-run-caller-input.type';@@ -14,10 +13,6 @@ export type AgentRunCallerHandler<input: AgentRunCallerInput<TCaller>,): Promise<AgentRunExecutionContext>;- resolveTurnAuthor(- input: AgentRunCallerInput<TCaller>,- ): Promise<ActorMetadata>;-getWaitingState(input: AgentRunCallerInput<TCaller>,): Promise<AgentRunCallerWaitingState>;diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/types/agent-run-execution-context.type.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/types/agent-run-execution-context.type.tsindex 11ca1ef0985..6a8bc2c6924 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/types/agent-run-execution-context.type.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/types/agent-run-execution-context.type.ts@@ -10,6 +10,8 @@ import { type RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permexport type AgentRunExecutionContext = {authContext: WorkspaceAuthContext;actorContext?: ActorMetadata;+ // who the run's turns are recorded as sent by+ turnCreatedBy: ActorMetadata;userWorkspaceId: string | null;// what the run itself can read, such as the record an awaited event is aboutrolePermissionConfig: RolePermissionConfig;diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/types/agent-runner-run-input.type.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/types/agent-runner-run-input.type.tsindex c448f309055..8387acfc437 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/types/agent-runner-run-input.type.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/types/agent-runner-run-input.type.ts@@ -1,5 +1,4 @@import { type RunAgentMessage } from 'twenty-shared/application';-import { type ActorMetadata } from 'twenty-shared/types';import { type AgentRunCaller } from 'src/engine/metadata-modules/ai/ai-agent-execution/types/agent-run-caller.type';import { type AgentRunConversation } from 'src/engine/metadata-modules/ai/ai-agent-execution/types/agent-run-conversation.type';@@ -22,6 +21,4 @@ export type AgentRunnerRunInput = {senderApplicationId: string | null;} | null;executionContext: AgentRunExecutionContext;- // resolved while recording the turn, so a failed lookup does not stop the run- resolveCreatedBy: () => Promise<ActorMetadata>;};diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-trigger/services/agent-trigger-runner.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-trigger/services/agent-trigger-runner.service.tsindex c269a060293..aac79e4f19d 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-trigger/services/agent-trigger-runner.service.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-trigger/services/agent-trigger-runner.service.ts@@ -1,7 +1,6 @@import { Injectable, Logger, type OnModuleInit } from '@nestjs/common';import { type AgentTrigger } from 'twenty-shared/application';-import { type ActorMetadata } from 'twenty-shared/types';import { isDefined } from 'twenty-shared/utils';import { v4 } from 'uuid';@@ -33,7 +32,6 @@ type AgentTriggerCaller = Extract<AgentRunCaller, { type: 'AGENT_TRIGGER' }>;type TriggeredRun = {agent: AgentEntity;trigger: AgentTrigger;- createdBy: ActorMetadata;executionContext: AgentRunExecutionContext;};@@ -69,7 +67,7 @@ export class AgentTriggerRunnerServicereturn;}- const { agent, trigger, createdBy, executionContext } = triggeredRun;+ const { agent, trigger, executionContext } = triggeredRun;await this.agentRunnerService.run({workspaceId,@@ -103,7 +101,6 @@ export class AgentTriggerRunnerServicesenderApplicationId: agent.applicationId,},executionContext,- resolveCreatedBy: async () => createdBy,});}@@ -113,12 +110,6 @@ export class AgentTriggerRunnerServicereturn (await this.findTriggeredRunOrThrow(input)).executionContext;}- async resolveTurnAuthor(- input: AgentRunCallerInput<AgentTriggerCaller>,- ): Promise<ActorMetadata> {- return (await this.findTriggeredRunOrThrow(input)).createdBy;- }-async getWaitingState(input: AgentRunCallerInput<AgentTriggerCaller>,): Promise<AgentRunCallerWaitingState> {@@ -177,10 +168,10 @@ export class AgentTriggerRunnerServicereturn {agent,trigger,- createdBy,executionContext: {authContext: { ...authContext, actingAgent },actorContext: createdBy,+ turnCreatedBy: createdBy,userWorkspaceId: null,rolePermissionConfig: buildAgentRolePermissionConfig({ agentRoleId }),usageOperationType: UsageOperationType.AI_WORKFLOW_TOKEN,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.tsindex 699f0b38423..b45743f3a6f 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@@ -138,8 +138,11 @@ export class AiAgentWorkflowAction implements WorkflowAction {}),});- const agentExecutionContext =- buildWorkflowAgentRunExecutionContext(executionContext);+ const agentExecutionContext = buildWorkflowAgentRunExecutionContext({+ executionContext,+ turnCreatedBy:+ await this.workflowAgentConversationService.findTurnCreatedBy(runInfo),+ });const resolvedPrompt = resolveInput(prompt, context) as string | undefined;const { threadId, outcome, summary } = await this.agentRunnerService.run({@@ -162,8 +165,6 @@ export class AiAgentWorkflowAction implements WorkflowAction {}: null,executionContext: agentExecutionContext,- resolveCreatedBy: () =>- this.workflowAgentConversationService.findTurnCreatedBy(runInfo),});await this.workflowRunStepLogService.setAiAgentStepLog({diff --git a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/ai-agent/utils/build-workflow-agent-run-execution-context.util.ts b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/ai-agent/utils/build-workflow-agent-run-execution-context.util.tsindex f2e6704affe..ce873769ee7 100644--- a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/ai-agent/utils/build-workflow-agent-run-execution-context.util.ts+++ b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/ai-agent/utils/build-workflow-agent-run-execution-context.util.ts@@ -1,3 +1,4 @@+import { type ActorMetadata } from 'twenty-shared/types';import { isDefined } from 'twenty-shared/utils';import { UsageOperationType } from 'src/engine/core-modules/usage/enums/usage-operation-type.enum';@@ -6,13 +7,18 @@ import { getRoleIdsFromRolePermissionConfig } from 'src/engine/twenty-orm/utils/import { type WorkflowExecutionContext } from 'src/modules/workflow/workflow-executor/types/workflow-execution-context.type';// The step's agent acts with the run's permissions, derived again each time the agent continues-export const buildWorkflowAgentRunExecutionContext = (- executionContext: WorkflowExecutionContext,-): AgentRunExecutionContext => ({+export const buildWorkflowAgentRunExecutionContext = ({+ executionContext,+ turnCreatedBy,+}: {+ executionContext: WorkflowExecutionContext;+ turnCreatedBy: ActorMetadata;+}): AgentRunExecutionContext => ({authContext: executionContext.authContext,actorContext: executionContext.isActingOnBehalfOfUser? executionContext.initiator: undefined,+ turnCreatedBy,userWorkspaceId:executionContext.authContext.type === 'user'? executionContext.authContext.userWorkspaceIddiff --git a/packages/twenty-server/src/modules/workflow/workflow-runner/workspace-services/workflow-agent-run-caller-handler.workspace-service.ts b/packages/twenty-server/src/modules/workflow/workflow-runner/workspace-services/workflow-agent-run-caller-handler.workspace-service.tsindex d2428a30e8b..7d4da1a2ba2 100644--- a/packages/twenty-server/src/modules/workflow/workflow-runner/workspace-services/workflow-agent-run-caller-handler.workspace-service.ts+++ b/packages/twenty-server/src/modules/workflow/workflow-runner/workspace-services/workflow-agent-run-caller-handler.workspace-service.ts@@ -1,6 +1,5 @@import { Injectable, type OnModuleInit } from '@nestjs/common';-import { type ActorMetadata } from 'twenty-shared/types';import { isDefined } from 'twenty-shared/utils';import { InjectMessageQueue } from 'src/engine/core-modules/message-queue/decorators/message-queue.decorator';@@ -49,21 +48,13 @@ export class WorkflowAgentRunCallerHandlerWorkspaceServiceworkspaceId,caller,}: AgentRunCallerInput<WorkflowStepCaller>): Promise<AgentRunExecutionContext> {- return buildWorkflowAgentRunExecutionContext(- await this.workflowExecutionContextService.getExecutionContext({- workflowRunId: caller.ref.workflowRunId,- workspaceId,- }),- );- }+ const runInfo = { workflowRunId: caller.ref.workflowRunId, workspaceId };- async resolveTurnAuthor({- workspaceId,- caller,- }: AgentRunCallerInput<WorkflowStepCaller>): Promise<ActorMetadata> {- return this.workflowAgentConversationService.findTurnCreatedBy({- workflowRunId: caller.ref.workflowRunId,- workspaceId,+ return buildWorkflowAgentRunExecutionContext({+ executionContext:+ await this.workflowExecutionContextService.getExecutionContext(runInfo),+ turnCreatedBy:+ await this.workflowAgentConversationService.findTurnCreatedBy(runInfo),});}