The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Validate runAgent input with the resolver validation pipe (#27979)
Paul Rastoin2449b6c84528
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/dtos/run-agent-message.input.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/dtos/run-agent-message.input.tsindex b33b842094b..c7940834dce 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/dtos/run-agent-message.input.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/dtos/run-agent-message.input.ts@@ -5,14 +5,11 @@ import {ArrayMaxSize,IsArray,IsEnum,- IsNotEmpty,IsOptional,IsString,- ValidateIf,ValidateNested,} from 'class-validator';import { type RunAgentMessage } from 'twenty-shared/application';-import { isNonEmptyArray } from 'twenty-shared/utils';import { MAX_RUN_AGENT_MESSAGE_ATTACHMENTS } from 'src/engine/metadata-modules/ai/ai-agent-execution/constants/max-run-agent-message-attachments.const';import { RunAgentMessageAttachmentInputDTO } from 'src/engine/metadata-modules/ai/ai-agent-execution/dtos/run-agent-message-attachment.input';@@ -25,10 +22,13 @@ export class RunAgentMessageInputDTO implements RunAgentMessage {role: RunAgentMessageRole;@IsString()- @ValidateIf(- (message: RunAgentMessageInputDTO) => !isNonEmptyArray(message.attachments),- )- @IsNotEmpty()+ // TODO(@abdulrahmancodes): restore once callers stop sending empty turns. It rejects the+ // empty assistant turns the Slack app replays, so those callers go first. The service+ // already refuses blank turns in input.+ // @ValidateIf(+ // (message: RunAgentMessageInputDTO) => !isNonEmptyArray(message.attachments),+ // )+ // @IsNotEmpty()@Field()content: string;diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/dtos/run-agent.input.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/dtos/run-agent.input.tsindex 84e4db17601..dedc7ff404a 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/dtos/run-agent.input.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/dtos/run-agent.input.ts@@ -19,8 +19,7 @@ import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/@InputType('RunAgentInput')export class RunAgentInputDTO {- @IsString()- @IsNotEmpty()+ @IsUUID()@Field()agentUniversalIdentifier: string;diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/resolvers/agent-run.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/resolvers/agent-run.resolver.tsindex 1067996fe96..4c20d2f7060 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/resolvers/agent-run.resolver.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/resolvers/agent-run.resolver.ts@@ -1,4 +1,9 @@-import { UseFilters, UseGuards, UseInterceptors } from '@nestjs/common';+import {+ UseFilters,+ UseGuards,+ UseInterceptors,+ UsePipes,+} from '@nestjs/common';import { Args, Mutation } from '@nestjs/graphql';import { PermissionFlagType } from 'twenty-shared/constants';@@ -7,6 +12,7 @@ import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decoratoimport { type FlatApiKey } from 'src/engine/core-modules/api-key/types/flat-api-key.type';import { type FlatApplication } from 'src/engine/core-modules/application/types/flat-application.type';import { BillingGraphqlApiExceptionFilter } from 'src/engine/core-modules/billing/filters/billing-graphql-api-exception.filter';+import { ResolverValidationPipe } from 'src/engine/core-modules/graphql/pipes/resolver-validation.pipe';import { UsageLimitGraphqlApiExceptionFilter } from 'src/engine/core-modules/usage-limit/filters/usage-limit-graphql-api-exception.filter';import { type FlatWorkspace } from 'src/engine/core-modules/workspace/types/flat-workspace.type';import { AuthApiKey } from 'src/engine/decorators/auth/auth-api-key.decorator';@@ -42,9 +48,7 @@ import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filtBillingGraphqlApiExceptionFilter,AuthGraphqlApiExceptionFilter,)-// TODO(@abdulrahmancodes): install ResolverValidationPipe here; without it every-// class-validator decorator on RunAgentInputDTO is inert. Enabling it rejects the-// empty assistant turns the Slack app replays, so those callers go first.+@UsePipes(ResolverValidationPipe)@MetadataResolver()export class AgentRunResolver {constructor(private readonly agentRunService: AgentRunService) {}diff --git a/packages/twenty-server/test/integration/graphql/suites/user-session/failing-run-agent-input.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/user-session/failing-run-agent-input.integration-spec.tsnew file mode 100644index 00000000000..d69290bbc34--- /dev/null+++ b/packages/twenty-server/test/integration/graphql/suites/user-session/failing-run-agent-input.integration-spec.ts@@ -0,0 +1,51 @@+import { randomUUID } from 'node:crypto';++import gql from 'graphql-tag';+import { runAgentQueryFactory } from 'test/integration/graphql/suites/user-session/utils/run-agent-query-factory.util';+import { makeMetadataApiRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';++import { ErrorCode } from 'src/engine/core-modules/graphql/utils/graphql-errors.util';++describe('runAgent input should be validated', () => {+ it('should refuse an agent universal identifier that is not a UUID', async () => {+ const response = await makeMetadataApiRequest(+ runAgentQueryFactory({+ agentUniversalIdentifier: 'slack-assistant',+ prompt: 'Hello',+ }),+ );++ expect(response.body.errors?.[0]?.extensions?.code).toBe(+ ErrorCode.BAD_USER_INPUT,+ );+ expect(response.body.errors?.[0]?.message).toContain(+ 'agentUniversalIdentifier must be a UUID',+ );+ });++ it('should let replayed messages carry an empty assistant turn past validation', async () => {+ const response = await makeMetadataApiRequest({+ query: gql`+ mutation RunAgent($input: RunAgentInput!) {+ runAgent(input: $input) {+ success+ }+ }+ `,+ variables: {+ input: {+ agentUniversalIdentifier: randomUUID(),+ messages: [+ { role: 'user', content: 'Who owns ACME?' },+ { role: 'assistant', content: '' },+ { role: 'user', content: 'Any update?' },+ ],+ },+ },+ });++ expect(response.body.errors?.[0]?.extensions?.code).toBe(+ ErrorCode.NOT_FOUND,+ );+ });+});