The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Record a run waiting on wait_for_* as waiting, not done (#27548)
Félix Malfait5fb435e42125
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/__tests__/agent-run-conversation.service.spec.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/__tests__/agent-run-conversation.service.spec.tsindex 2bf9903129d..c469e3e9e35 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/__tests__/agent-run-conversation.service.spec.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/__tests__/agent-run-conversation.service.spec.ts@@ -129,7 +129,7 @@ describe('AgentRunConversationService', () => {expect(turnRecorderService.finishExecutedTurn).toHaveBeenCalledWith({...turn,execution,- isAwaitingAnswer: true,+ isWaiting: true,});expect(threadService.recordThreadActivity).toHaveBeenCalledWith({workspaceId: 'workspace-id',@@ -138,6 +138,40 @@ describe('AgentRunConversationService', () => {});});+ it('leaves the turn waiting without asking anything when the run paused on a wait', async () => {+ const { service, conversationWriterService, turnRecorderService } =+ buildService();+ const pausedExecution = { ...execution, isPaused: true };++ conversationWriterService.insertExecutionReply.mockResolvedValue({+ isAwaitingAnswer: false,+ replyParts: [+ {+ type: 'tool-wait_for_duration',+ toolCallId: 'wait-call-id',+ state: 'output-available',+ input: { minutes: 5 },+ output: { success: true, result: { status: 'pending' } },+ },+ ],+ });++ await expect(+ service.closeTurn({+ ...turn,+ title: 'Draft the quote',+ agentId: 'agent-id',+ execution: pausedExecution,+ }),+ ).resolves.toEqual({ isAwaitingAnswer: false });+ expect(turnRecorderService.finishExecutedTurn).toHaveBeenCalledTimes(1);+ expect(turnRecorderService.finishExecutedTurn).toHaveBeenCalledWith({+ ...turn,+ execution: pausedExecution,+ isWaiting: true,+ });+ });+it('keeps the answer awaited when the inbox cannot be told', async () => {const { service, conversationWriterService, threadService } =buildService();diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/__tests__/agent-run-suspension.service.spec.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/__tests__/agent-run-suspension.service.spec.tsindex aff94e8d2c4..8dd98384c53 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/__tests__/agent-run-suspension.service.spec.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/__tests__/agent-run-suspension.service.spec.ts@@ -18,6 +18,7 @@ const buildService = ({pendingQuestionMessageId = 'question-message-id' as string | null,hasPostedCall = true,wakeUps = [] as object[],+ waitMessageIds = [] as string[],} = {}) => {const wakeUpRepository = { find: jest.fn().mockResolvedValue(wakeUps) };const threadRepository = {@@ -30,12 +31,17 @@ const buildService = ({),};const messagePartRepository = {- query: jest.fn().mockResolvedValue(undefined),+ query: jest+ .fn()+ .mockResolvedValue(waitMessageIds.map((messageId) => ({ messageId }))),existsBy: jest.fn().mockResolvedValue(hasPostedCall),};const threadLifecycleService = {closePendingQuestion: jest.fn().mockResolvedValue(undefined),};+ const turnRecorderService = {+ endWaitingTurn: jest.fn().mockResolvedValue(undefined),+ };const pendingWakeUpService = {claim: jest.fn()@@ -50,6 +56,7 @@ const buildService = ({threadRepository as never,messagePartRepository as never,threadLifecycleService as never,+ turnRecorderService as never,pendingWakeUpService as never,{ getHandlerOrThrow: () => ({ onOutcome }) } as never,{} as never,@@ -59,6 +66,7 @@ const buildService = ({service,threadLifecycleService,messagePartRepository,+ turnRecorderService,pendingWakeUpService,onOutcome,};@@ -111,6 +119,63 @@ describe('AgentRunSuspensionService', () => {threadLifecycleService.closePendingQuestion,).not.toHaveBeenCalled();});++ it('cancels the turn that waited on the dropped wait', async () => {+ const { service, turnRecorderService } = buildService({+ pendingQuestionMessageId: null,+ waitMessageIds: ['wait-message-id'],+ });++ await service.closeAwaitedCalls({+ workspaceId: 'workspace-id',+ threadId: 'thread-id',+ isAwaitingAnswer: false,+ });++ expect(turnRecorderService.endWaitingTurn).toHaveBeenCalledTimes(1);+ expect(turnRecorderService.endWaitingTurn).toHaveBeenCalledWith({+ workspaceId: 'workspace-id',+ messageId: 'wait-message-id',+ status: AgentTurnStatus.CANCELLED,+ });+ });+ });++ describe('recordWaitOutcome', () => {+ it('completes the turn that waited on a wait that is over', async () => {+ const { service, turnRecorderService } = buildService({+ waitMessageIds: ['wait-message-id'],+ });++ await service.recordWaitOutcome({+ workspaceId: 'workspace-id',+ threadId: 'thread-id',+ outcome: { type: 'TIME_ELAPSED' },+ });++ expect(turnRecorderService.endWaitingTurn).toHaveBeenCalledTimes(1);+ expect(turnRecorderService.endWaitingTurn).toHaveBeenCalledWith({+ workspaceId: 'workspace-id',+ messageId: 'wait-message-id',+ status: AgentTurnStatus.COMPLETED,+ });+ });++ it('goes on when the turn cannot be ended', async () => {+ const { service, turnRecorderService } = buildService({+ waitMessageIds: ['wait-message-id'],+ });++ turnRecorderService.endWaitingTurn.mockRejectedValue(new Error('boom'));++ await expect(+ service.recordWaitOutcome({+ workspaceId: 'workspace-id',+ threadId: 'thread-id',+ outcome: { type: 'EXPIRED' },+ }),+ ).resolves.toBeUndefined();+ });});describe('closePostedCalls', () => {diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/agent-run-conversation.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/agent-run-conversation.service.tsindex 36186b6b601..b46bca33097 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/agent-run-conversation.service.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/agent-run-conversation.service.ts@@ -1,5 +1,7 @@import { Injectable, Logger } from '@nestjs/common';+import { getToolName, isToolUIPart } from 'ai';+import { isNonEmptyString } from '@sniptt/guards';import {type ExtendedFileUIPart,@@ -11,6 +13,7 @@ import { isDefined } from 'twenty-shared/utils';import { CacheLockService } from 'src/engine/core-modules/cache-lock/cache-lock.service';import { CacheLockException } from 'src/engine/core-modules/cache-lock/exceptions/cache-lock.exception';+import { AGENT_WAIT_TOOL_NAMES } from 'src/engine/metadata-modules/ai/ai-agent-execution/pausing-tools/constants/agent-wait-tool-names.constant';import { AgentChatThreadService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-chat-thread.service';import { findLastMessageText } from 'src/engine/metadata-modules/ai/ai-chat/utils/find-last-message-text.util';import { mapErrorToStreamError } from 'src/engine/metadata-modules/ai/ai-history/utils/map-error-to-stream-error.util';@@ -25,6 +28,7 @@ import { AgentHistoryRepository } from 'src/engine/metadata-modules/ai/ai-historimport { InjectAgentHistoryRepository } from 'src/engine/metadata-modules/ai/ai-history/repositories/inject-agent-history-repository.decorator';import { AgentConversationWriterService } from 'src/engine/metadata-modules/ai/ai-history/services/agent-conversation-writer.service';import { type AgentChatThreadWorkspaceEntity } from 'src/engine/metadata-modules/ai/ai-history/standard-objects/agent-chat-thread.workspace-entity';+import { isAwaitingPausingToolOutput } from 'src/engine/metadata-modules/ai/ai-history/utils/is-awaiting-pausing-tool-output.util';import { type RecordableAgentExecution } from 'src/engine/metadata-modules/ai/ai-history/types/recordable-agent-execution.type';import {AiException,@@ -208,9 +212,19 @@ export class AgentRunConversationService {throw error;});+ // a run that paused on a wait goes on later, so its turn is not done yet+ const isWaitingOnWait =+ execution.isPaused === true &&+ replyParts.some(+ (part) =>+ isToolUIPart(part) &&+ AGENT_WAIT_TOOL_NAMES.includes(getToolName(part)) &&+ isAwaitingPausingToolOutput(part.output),+ );+await this.turnRecorderService.finishExecutedTurn({...turn,- isAwaitingAnswer,+ isWaiting: isAwaitingAnswer || isWaitingOnWait,});// the waiting call is already saved and can be answered from the conversation, so adiff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/agent-run-suspension.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/agent-run-suspension.service.tsindex 28dacb19405..28d2f106449 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/agent-run-suspension.service.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/agent-run-suspension.service.ts@@ -1,4 +1,4 @@-import { Injectable } from '@nestjs/common';+import { Injectable, Logger } from '@nestjs/common';import { type AgentRunSummary } from 'twenty-shared/ai';import { type PendingWakeUpCondition } from 'twenty-shared/pending-wake-up';@@ -22,6 +22,7 @@ import { AgentChatThreadLifecycleService } from 'src/engine/metadata-modules/ai/import { AgentTurnStatus } from 'src/engine/metadata-modules/ai/ai-history/enums/agent-turn-status.enum';import { AgentHistoryRepository } from 'src/engine/metadata-modules/ai/ai-history/repositories/agent-history-repository';import { InjectAgentHistoryRepository } from 'src/engine/metadata-modules/ai/ai-history/repositories/inject-agent-history-repository.decorator';+import { AgentTurnRecorderService } from 'src/engine/metadata-modules/ai/ai-history/services/agent-turn-recorder.service';import { type AgentChatThreadWorkspaceEntity } from 'src/engine/metadata-modules/ai/ai-history/standard-objects/agent-chat-thread.workspace-entity';import { type AgentMessagePartWorkspaceEntity } from 'src/engine/metadata-modules/ai/ai-history/standard-objects/agent-message-part.workspace-entity';import {@@ -38,6 +39,8 @@ const SUSPENDED_RUN_WAKE_UP_KEY = 'RUN';// payload what continues it and who gets its outcome@Injectable()export class AgentRunSuspensionService {+ private readonly logger = new Logger(AgentRunSuspensionService.name);+constructor(@InjectWorkspaceScopedRepository(PendingWakeUpEntity)private readonly wakeUpRepository: WorkspaceScopedRepository<PendingWakeUpEntity>,@@ -46,6 +49,7 @@ export class AgentRunSuspensionService {@InjectAgentHistoryRepository('agentMessagePart')private readonly messagePartRepository: AgentHistoryRepository<AgentMessagePartWorkspaceEntity>,private readonly threadLifecycleService: AgentChatThreadLifecycleService,+ private readonly turnRecorderService: AgentTurnRecorderService,private readonly pendingWakeUpService: PendingWakeUpService,private readonly callerHandlerRegistry: AgentRunCallerHandlerRegistryService,@InjectMessageQueue(MessageQueue.aiQueue)@@ -208,7 +212,8 @@ export class AgentRunSuspensionService {}}- // A wait call stays pending in the conversation until its wake-up resolves it, then carries the outcome+ // A wait call stays pending in the conversation until its wake-up resolves it, then carries the+ // outcome, and the turn that waited on it ends with itasync recordWaitOutcome({workspaceId,threadId,@@ -218,19 +223,42 @@ export class AgentRunSuspensionService {threadId: string;outcome: Parameters<typeof buildWaitOutcomeToolOutput>[0];}): Promise<void> {- await this.messagePartRepository.query(workspaceId, ({ manager, table }) =>- manager.query(- `UPDATE ${table('agentMessagePart')} part SET "toolOutput" = $2::jsonb, "updatedAt" = now()- FROM ${table('agentMessage')} message- WHERE message.id = part."messageId" AND message."threadId" = $1- AND part."toolName" = ANY($3) AND part."toolOutput"->'result'->>'status' = 'pending'`,- [- threadId,- JSON.stringify(buildWaitOutcomeToolOutput(outcome)),- AGENT_WAIT_TOOL_NAMES,- ],- ),+ const waitMessages = await this.messagePartRepository.query(+ workspaceId,+ ({ manager, table }) =>+ manager.query<{ messageId: string }[]>(+ `WITH closed_wait AS (+ UPDATE ${table('agentMessagePart')} part SET "toolOutput" = $2::jsonb, "updatedAt" = now()+ FROM ${table('agentMessage')} message+ WHERE message.id = part."messageId" AND message."threadId" = $1+ AND part."toolName" = ANY($3) AND part."toolOutput"->'result'->>'status' = 'pending'+ RETURNING part."messageId"+ ) SELECT DISTINCT "messageId" FROM closed_wait`,+ [+ threadId,+ JSON.stringify(buildWaitOutcomeToolOutput(outcome)),+ AGENT_WAIT_TOOL_NAMES,+ ],+ ),);++ for (const { messageId } of waitMessages) {+ // the turn only shows what happened, so failing to end it must not fail the run or its release+ await this.turnRecorderService+ .endWaitingTurn({+ workspaceId,+ messageId,+ status:+ outcome.type === 'CANCELLED'+ ? AgentTurnStatus.CANCELLED+ : AgentTurnStatus.COMPLETED,+ })+ .catch((error: unknown) =>+ this.logger.warn(+ `Could not end the turn of wait message ${messageId}: ${error instanceof Error ? error.message : String(error)}`,+ ),+ );+ }}// A call a caller posted stops waiting with the caller's wake-updiff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/services/__tests__/agent-turn-recorder.service.finish-executed-turn.spec.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/services/__tests__/agent-turn-recorder.service.finish-executed-turn.spec.tsindex 82b9e73f2ae..0b53fc374d4 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/services/__tests__/agent-turn-recorder.service.finish-executed-turn.spec.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/services/__tests__/agent-turn-recorder.service.finish-executed-turn.spec.ts@@ -53,7 +53,7 @@ describe('AgentTurnRecorderService.finishExecutedTurn', () => {await service.finishExecutedTurn({...turn,execution: { turnUsage: TURN_USAGE },- isAwaitingAnswer: true,+ isWaiting: true,});expect(finish).toHaveBeenCalledWith(@@ -67,7 +67,7 @@ describe('AgentTurnRecorderService.finishExecutedTurn', () => {await service.finishExecutedTurn({...turn,execution: { turnUsage: TURN_USAGE, hasNoMoreAvailableCredits: true },- isAwaitingAnswer: true,+ isWaiting: true,});expect(finish).toHaveBeenCalledWith(diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/services/agent-turn-recorder.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/services/agent-turn-recorder.service.tsindex 677ea276a4d..ac49e9ef0ff 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/services/agent-turn-recorder.service.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/services/agent-turn-recorder.service.ts@@ -188,14 +188,14 @@ export class AgentTurnRecorderService {threadId,turnId,execution,- isAwaitingAnswer = false,+ isWaiting = false,error,}: {workspaceId: string;threadId: string;turnId: string;execution: RecordableAgentExecution;- isAwaitingAnswer?: boolean;+ isWaiting?: boolean;error?: StreamErrorPayload;}): Promise<void> {if (isDefined(execution.turnUsage)) {@@ -224,7 +224,7 @@ export class AgentTurnRecorderService {...(isDefined(failureError)? { status: AgentTurnStatus.FAILED, error: failureError }: {- status: isAwaitingAnswer+ status: isWaiting? AgentTurnStatus.WAITING_FOR_INPUT: AgentTurnStatus.COMPLETED,}),diff --git a/packages/twenty-server/test/integration/ai/suites/agent-run-wait.integration-spec.ts b/packages/twenty-server/test/integration/ai/suites/agent-run-wait.integration-spec.tsindex 9267ba92f60..20e34205d8d 100644--- a/packages/twenty-server/test/integration/ai/suites/agent-run-wait.integration-spec.ts+++ b/packages/twenty-server/test/integration/ai/suites/agent-run-wait.integration-spec.ts@@ -283,6 +283,7 @@ describe('agent runs that wait (integration)', () => {);expect(await findWaitCallStatus(threadId)).toBe('pending');+ expect(await findTurnStatuses(threadId)).toEqual(['waiting_for_input']);await updateOneAgent({expectToFail: false,@@ -300,6 +301,7 @@ describe('agent runs that wait (integration)', () => {expect(executeAgent).toHaveBeenCalledTimes(1);expect(await findWaitCallStatus(threadId)).toBe('cancelled');+ expect(await findTurnStatuses(threadId)).toEqual(['cancelled']);await updateOneAgent({expectToFail: false,