The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Register the wait on an answer before the call can be answered (#27705)
Félix Malfait164238658bdc
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/agent-caller-conversation.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/agent-caller-conversation.service.tsindex a49ee863ea1..01cc16af0ea 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/agent-caller-conversation.service.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/agent-caller-conversation.service.ts@@ -34,6 +34,11 @@ type AgentCallerAwaitedToolCall = {toolName: string;arguments: Record<string, unknown>;caller: AgentRunCaller;+ // called before the call is posted, so its answer always finds the caller waiting+ waitOnAnswer: (postedCall: {+ threadId: string;+ toolCallId: string;+ }) => Promise<void>;};// The conversations a caller, such as a workflow step, holds with a member's inbox: the one its agent@@ -189,12 +194,21 @@ export class AgentCallerConversationService {let pendingToolCall:| ReturnType<AgentCallerConversationService['buildPendingToolCall']>| undefined;- const buildAwaitingToolCall = () =>- (pendingToolCall ??= this.buildPendingToolCall({- workspaceId,- awaitedToolCall,- summary: message.text,- }));+ const buildAwaitingToolCall = async (postedCall: {+ threadId: string;+ toolCallId: string;+ }) => {+ const awaitingToolCall = await (pendingToolCall ??=+ this.buildPendingToolCall({+ workspaceId,+ awaitedToolCall,+ summary: message.text,+ }));++ await awaitedToolCall.waitOnAnswer(postedCall);++ return awaitingToolCall;+ };// a message sent again finds the call it posted before: a pending one is still awaited, an answered// one is reused so nothing runs twice, and one closed unanswered, such as by a run that ended anddiff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-inbox.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-inbox.service.tsindex 5218fe8b227..bc4d7b46fbe 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-inbox.service.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-inbox.service.ts@@ -72,7 +72,10 @@ export class AgentInboxService {resolveProposal?: ResolveInboxProposal;// a pausing call the server resolves, with its pending output, only when the message is written,// so a message delivered earlier is found even once the call could no longer be resolved- buildAwaitingToolCall?: () => Promise<{+ buildAwaitingToolCall?: (postedCall: {+ threadId: string;+ toolCallId: string;+ }) => Promise<{toolName: string;input: Record<string, unknown>;output: Record<string, unknown>;@@ -118,7 +121,10 @@ export class AgentInboxService {};}- const awaitingToolCall = await buildAwaitingToolCall?.();+ const awaitingToolCall = await buildAwaitingToolCall?.({+ threadId,+ toolCallId,+ });const toolCallPart = isDefined(awaitingToolCall)? {part: buildToolPart({ ...awaitingToolCall, toolCallId }),diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-tool-call-answer/services/tool-call-answer.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-tool-call-answer/services/tool-call-answer.service.tsindex 3b19639bb45..5f914317b22 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-tool-call-answer/services/tool-call-answer.service.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-tool-call-answer/services/tool-call-answer.service.ts@@ -16,6 +16,7 @@ import { type ToolContext } from 'src/engine/core-modules/tool-provider/types/toimport { type WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';import { AgentMessageRole } from 'src/engine/metadata-modules/ai/ai-history/enums/agent-message-role.enum';import { type PausingToolCompletionContext } from 'src/engine/metadata-modules/ai/ai-agent-execution/pausing-tools/types/pausing-tool-completion-context.type';+import { AgentRunConversationService } from 'src/engine/metadata-modules/ai/ai-agent-execution/services/agent-run-conversation.service';import { isAwaitingPausingToolOutput } from 'src/engine/metadata-modules/ai/ai-history/utils/is-awaiting-pausing-tool-output.util';import { parsePausingToolCall } from 'src/engine/metadata-modules/ai/ai-agent-execution/pausing-tools/utils/parse-pausing-tool-call.util';import { readProposedToolCallAnswer } from 'src/engine/metadata-modules/ai/ai-agent-execution/pausing-tools/utils/read-proposed-tool-call-answer.util';@@ -78,9 +79,22 @@ export class ToolCallAnswerService {private readonly toolRegistryService: ToolRegistryService,private readonly conversationReaderService: AgentConversationReaderService,private readonly threadLifecycleService: AgentChatThreadLifecycleService,+ private readonly agentRunConversationService: AgentRunConversationService,) {}- async answer(args: AnswerToolCallArgs): Promise<AnswerToolCallOutcome> {+ // a run holds its conversation until it has suspended, so an answer to the question it just+ // asked finds the run waiting on it rather than starting a chat+ answer(args: AnswerToolCallArgs): Promise<AnswerToolCallOutcome> {+ return this.agentRunConversationService.withThreadLockForMessage({+ workspaceId: args.workspace.id,+ threadId: args.threadId,+ work: () => this.answerUnderLock(args),+ });+ }++ private async answerUnderLock(+ args: AnswerToolCallArgs,+ ): Promise<AnswerToolCallOutcome> {const { threadId, toolCallId, userWorkspaceId, workspace } = args;const workspaceId = workspace.id;diff --git a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/send-chat-message/__tests__/send-chat-message.workflow-action.spec.ts b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/send-chat-message/__tests__/send-chat-message.workflow-action.spec.tsindex 017b4cd9e05..b0827fe35fd 100644--- a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/send-chat-message/__tests__/send-chat-message.workflow-action.spec.ts+++ b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/send-chat-message/__tests__/send-chat-message.workflow-action.spec.ts@@ -8,6 +8,7 @@ import { WorkflowRunInboxSenderWorkspaceService } from 'src/modules/workflow/worimport { createMockIteratorStep } from 'src/modules/workflow/workflow-executor/utils/create-mock-workflow-steps.util';import { SendChatMessageWorkflowAction } from 'src/modules/workflow/workflow-executor/workflow-actions/send-chat-message/send-chat-message.workflow-action';import { type WorkflowAction } from 'src/modules/workflow/workflow-executor/workflow-actions/types/workflow-action.type';+import { type WorkflowStepWaitWorkspaceService } from 'src/modules/workflow/workflow-wait/services/workflow-step-wait.workspace-service';const WORKSPACE_ID = 'workspace-id';const WORKFLOW_RUN_ID = 'workflow-run-id';@@ -34,6 +35,7 @@ describe('SendChatMessageWorkflowAction', () => {const sendMessage = jest.fn();const findWorkflowRun = jest.fn();const findCoreWorkflowById = jest.fn();+ const armStepWait = jest.fn();let action: SendChatMessageWorkflowAction;const execute = (input: Record<string, unknown>) =>@@ -70,6 +72,7 @@ describe('SendChatMessageWorkflowAction', () => {} as unknown as WorkspaceOrmManager,{ findCoreWorkflowById } as unknown as WorkflowCoreSyncService,),+ { arm: armStepWait } as unknown as WorkflowStepWaitWorkspaceService,);});@@ -125,11 +128,41 @@ describe('SendChatMessageWorkflowAction', () => {type: 'WORKFLOW_STEP',ref: { workflowRunId: WORKFLOW_RUN_ID, stepId: 'step-1' },},+ waitOnAnswer: expect.any(Function),},}),);});+ it('waits on the answer as the call is posted, before it can be answered', async () => {+ sendMessage.mockImplementation(async ({ awaitedToolCall }) => {+ await awaitedToolCall.waitOnAnswer({+ threadId: 'thread-id',+ toolCallId: 'call-id',+ });++ return {+ status: 'AWAITING',+ threadId: 'thread-id',+ toolCallId: 'call-id',+ };+ });++ await execute({+ workspaceMemberId: WORKSPACE_MEMBER_ID,+ text: 'Approve the update?',+ toolCall: { toolName: 'update_one_company', arguments: { id: 'id' } },+ });++ expect(armStepWait).toHaveBeenCalledTimes(1);+ expect(armStepWait).toHaveBeenCalledWith({+ workspaceId: WORKSPACE_ID,+ workflowRunId: WORKFLOW_RUN_ID,+ stepId: 'step-1',+ wait: { type: 'ANSWER', threadId: 'thread-id', toolCallId: 'call-id' },+ });+ });+it('sends each iteration once, even when two iterations say the same thing', async () => {const input = {workspaceMemberId: WORKSPACE_MEMBER_ID,diff --git a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/send-chat-message/send-chat-message-action.module.ts b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/send-chat-message/send-chat-message-action.module.tsindex 5dc6aec8db6..f697d1aac69 100644--- a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/send-chat-message/send-chat-message-action.module.ts+++ b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/send-chat-message/send-chat-message-action.module.ts@@ -3,9 +3,14 @@ import { Module } from '@nestjs/common';import { AiAgentExecutionModule } from 'src/engine/metadata-modules/ai/ai-agent-execution/ai-agent-execution.module';import { WorkflowRunInboxSenderModule } from 'src/modules/workflow/workflow-executor/services/workflow-run-inbox-sender.module';import { SendChatMessageWorkflowAction } from 'src/modules/workflow/workflow-executor/workflow-actions/send-chat-message/send-chat-message.workflow-action';+import { WorkflowStepWaitModule } from 'src/modules/workflow/workflow-wait/workflow-step-wait.module';@Module({- imports: [AiAgentExecutionModule, WorkflowRunInboxSenderModule],+ imports: [+ AiAgentExecutionModule,+ WorkflowRunInboxSenderModule,+ WorkflowStepWaitModule,+ ],providers: [SendChatMessageWorkflowAction],exports: [SendChatMessageWorkflowAction],})diff --git a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/send-chat-message/send-chat-message.workflow-action.ts b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/send-chat-message/send-chat-message.workflow-action.tsindex 9d654fd1f3f..ee29b589647 100644--- a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/send-chat-message/send-chat-message.workflow-action.ts+++ b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/send-chat-message/send-chat-message.workflow-action.ts@@ -19,12 +19,14 @@ import { findStepOrThrow } from 'src/modules/workflow/workflow-executor/utils/fiimport { resolveConversationThreadKey } from 'src/modules/workflow/workflow-executor/utils/resolve-conversation-thread-key.util';import { isWorkflowSendChatMessageAction } from 'src/modules/workflow/workflow-executor/workflow-actions/send-chat-message/guards/is-workflow-send-chat-message-action.guard';import { type WorkflowSendChatMessageActionInput } from 'src/modules/workflow/workflow-executor/workflow-actions/send-chat-message/types/workflow-send-chat-message-action-input.type';+import { WorkflowStepWaitWorkspaceService } from 'src/modules/workflow/workflow-wait/services/workflow-step-wait.workspace-service';@Injectable()export class SendChatMessageWorkflowAction implements WorkflowAction {constructor(private readonly agentCallerConversationService: AgentCallerConversationService,private readonly workflowRunInboxSenderService: WorkflowRunInboxSenderWorkspaceService,+ private readonly workflowStepWaitWorkspaceService: WorkflowStepWaitWorkspaceService,) {}async execute({@@ -98,6 +100,13 @@ export class SendChatMessageWorkflowAction implements WorkflowAction {workflowRunId: runInfo.workflowRunId,stepId: currentStepId,}),+ waitOnAnswer: (postedCall) =>+ this.workflowStepWaitWorkspaceService.arm({+ workspaceId: runInfo.workspaceId,+ workflowRunId: runInfo.workflowRunId,+ stepId: currentStepId,+ wait: { type: 'ANSWER', ...postedCall },+ }),}: undefined,});diff --git a/packages/twenty-server/test/integration/graphql/suites/workflow/workflow-send-chat-message.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/workflow/workflow-send-chat-message.integration-spec.tsindex 733378d6e46..c88d346a3db 100644--- a/packages/twenty-server/test/integration/graphql/suites/workflow/workflow-send-chat-message.integration-spec.ts+++ b/packages/twenty-server/test/integration/graphql/suites/workflow/workflow-send-chat-message.integration-spec.ts@@ -286,6 +286,8 @@ describe('Send chat message workflow step', () => {type: 'WORKFLOW_STEP',ref: { workflowRunId, stepId },},+ // the message was already written, so the call is not built again+ waitOnAnswer: async () => {},},});