Skip to content

AI Agents & MCPs & AI Workflow Automation • (~400 MCP servers for AI agents) • AI Automation / AI Agent with MCPs • AI Workflows & AI Agents • MCPs for AI Agents

fix(chat): stop the chat getting stuck on a setting it already removed (#16111)

Hazem Adelb82dd20be2ef
diff --git a/packages/server/api/src/app/mcp/tools/ap-build-flow.ts b/packages/server/api/src/app/mcp/tools/ap-build-flow.ts
index 6de0a0c4b7e..278a8921522 100644
--- a/packages/server/api/src/app/mcp/tools/ap-build-flow.ts
+++ b/packages/server/api/src/app/mcp/tools/ap-build-flow.ts
@@ -1,4 +1,4 @@
-import { Permission } from '@activepieces/core-utils'
+import { isNil, Permission } from '@activepieces/core-utils'
import { FlowActionType, FlowCreatorType, FlowOperationType, flowStructureUtil, FlowTriggerType, McpToolContext, McpToolDefinition, PieceTrigger, StepLocationRelativeToParent, UpdateActionRequest } from '@activepieces/shared'
import { FastifyBaseLogger } from 'fastify'
import { z } from 'zod'
@@ -96,8 +96,9 @@ export const apBuildFlowTool = ({ mcp, userId }: McpToolContext, log: FastifyBas
return triggerVersionResult.error
}
+ const triggerUnknown = await mcpUtils.dropUnknownInputProps({ pieceName: triggerVersionResult.normalizedPieceName, pieceVersion: triggerVersionResult.pieceVersion, componentName: trigger.triggerName, componentType: 'trigger', input: trigger.input, platformId, log })
const triggerInput = {
- ...(trigger.input ?? {}),
+ ...triggerUnknown.input,
...(trigger.auth ? { auth: `{{connections['${trigger.auth}']}}` } : {}),
}
const triggerPayload = PieceTrigger.parse({
@@ -119,7 +120,6 @@ export const apBuildFlowTool = ({ mcp, userId }: McpToolContext, log: FastifyBas
operation: { type: FlowOperationType.UPDATE_TRIGGER, request: triggerPayload },
})
const unknownPropFindings: string[] = []
- const triggerUnknown = await mcpUtils.detectUnknownInputProps({ pieceName: triggerVersionResult.normalizedPieceName, pieceVersion: triggerVersionResult.pieceVersion, componentName: trigger.triggerName, componentType: 'trigger', input: trigger.input, platformId, log })
if (triggerUnknown.unknownKeys.length > 0) {
unknownPropFindings.push(`trigger: ${triggerUnknown.message}`)
}
@@ -148,7 +148,8 @@ export const apBuildFlowTool = ({ mcp, userId }: McpToolContext, log: FastifyBas
resolvedPieceName = versionResult.normalizedPieceName
}
- const rewritten = mcpUtils.rewriteAllReferences({ input: step.input, loopItems: step.loopItems, trigger: latestTrigger })
+ const stepUnknown = await knownStepInput({ step, pieceName: resolvedPieceName, pieceVersion: resolvedPieceVersion, platformId, log })
+ const rewritten = mcpUtils.rewriteAllReferences({ input: stepUnknown.input, loopItems: step.loopItems, trigger: latestTrigger })
const rewrittenStep = { ...step, input: rewritten.input, loopItems: rewritten.loopItems }
const skeleton = buildSkeleton({ step: rewrittenStep, name: stepName, resolvedPieceVersion, resolvedPieceName })
const parseResult = UpdateActionRequest.safeParse(skeleton)
@@ -179,11 +180,8 @@ export const apBuildFlowTool = ({ mcp, userId }: McpToolContext, log: FastifyBas
},
})
- if (step.type === FlowActionType.PIECE && resolvedPieceName && resolvedPieceVersion && step.actionName) {
- const stepUnknown = await mcpUtils.detectUnknownInputProps({ pieceName: resolvedPieceName, pieceVersion: resolvedPieceVersion, componentName: step.actionName, componentType: 'action', input: step.input, platformId, log })
- if (stepUnknown.unknownKeys.length > 0) {
- unknownPropFindings.push(`${stepName} (${step.displayName}): ${stepUnknown.message}`)
- }
+ if (stepUnknown.unknownKeys.length > 0) {
+ unknownPropFindings.push(`${stepName} (${step.displayName}): ${stepUnknown.message}`)
}
if (location === StepLocationRelativeToParent.AFTER) {
@@ -228,6 +226,21 @@ export const apBuildFlowTool = ({ mcp, userId }: McpToolContext, log: FastifyBas
}
}
+async function knownStepInput({ step, pieceName, pieceVersion, platformId, log }: {
+ step: z.infer<typeof stepSpec>
+ pieceName: string | undefined
+ pieceVersion: string | undefined
+ platformId: string
+ log: FastifyBaseLogger
+}): Promise<{ input: Record<string, unknown> | undefined, unknownKeys: string[], message: string }> {
+ const actionName = step.actionName
+ const isPieceAction = step.type === FlowActionType.PIECE && !isNil(pieceName) && !isNil(pieceVersion) && !isNil(actionName)
+ if (!isPieceAction) {
+ return { input: step.input, unknownKeys: [], message: '' }
+ }
+ return mcpUtils.dropUnknownInputProps({ pieceName, pieceVersion, componentName: actionName, componentType: 'action', input: step.input, platformId, log })
+}
+
function buildSkeleton({ step, name, resolvedPieceVersion, resolvedPieceName }: {
step: z.infer<typeof stepSpec>
name: string
diff --git a/packages/server/api/src/app/mcp/tools/ap-update-step.ts b/packages/server/api/src/app/mcp/tools/ap-update-step.ts
index 1da54d07ecf..3a5fbbb473d 100644
--- a/packages/server/api/src/app/mcp/tools/ap-update-step.ts
+++ b/packages/server/api/src/app/mcp/tools/ap-update-step.ts
@@ -135,10 +135,15 @@ export const apUpdateStepTool = ({ mcp, userId }: McpToolContext, log: FastifyBa
const { pieceName, pieceVersion, actionName: resolvedActionName } = updatedSettings
if (typeof pieceName === 'string' && typeof pieceVersion === 'string' && typeof resolvedActionName === 'string') {
- const unknownPropsError = await mcpUtils.rejectUnknownInputProps({ pieceName, pieceVersion, componentName: resolvedActionName, componentType: 'action', input: updatedSettings.input, platformId: project.platformId, log })
+ const callerInput = {
+ ...(rewritten.input ?? {}),
+ ...(auth !== undefined && { auth: `{{connections['${auth}']}}` }),
+ }
+ const { input: knownInput, error: unknownPropsError } = await mcpUtils.keepKnownInputProps({ pieceName, pieceVersion, componentName: resolvedActionName, componentType: 'action', input: updatedSettings.input, callerInput, platformId: project.platformId, log })
if (unknownPropsError) {
return unknownPropsError
}
+ updatedSettings.input = knownInput
}
}
diff --git a/packages/server/api/src/app/mcp/tools/ap-update-trigger.ts b/packages/server/api/src/app/mcp/tools/ap-update-trigger.ts
index 492c42bc32c..a05c75b06f0 100644
--- a/packages/server/api/src/app/mcp/tools/ap-update-trigger.ts
+++ b/packages/server/api/src/app/mcp/tools/ap-update-trigger.ts
@@ -64,13 +64,11 @@ export const apUpdateTriggerTool = ({ mcp, userId }: McpToolContext, log: Fastif
const { auth: _rawAuth, ...rawInputWithoutAuth } = rawInput ?? {}
const rewritten = mcpUtils.rewriteAllReferences({ input: rawInputWithoutAuth, trigger: flow.version.trigger })
- const input = {
- ...(existingPieceSettings?.input ?? {}),
+ const callerInput = {
...(rewritten.input ?? {}),
...(auth !== undefined && { auth: `{{connections['${auth}']}}` }),
}
-
- const unknownPropsError = await mcpUtils.rejectUnknownInputProps({ pieceName: resolvedPieceName, pieceVersion, componentName: triggerName, componentType: 'trigger', input, platformId: project.platformId, log })
+ const { input, error: unknownPropsError } = await mcpUtils.keepKnownInputProps({ pieceName: resolvedPieceName, pieceVersion, componentName: triggerName, componentType: 'trigger', input: { ...(existingPieceSettings?.input ?? {}), ...callerInput }, callerInput, platformId: project.platformId, log })
if (unknownPropsError) {
return unknownPropsError
}
diff --git a/packages/server/api/src/app/mcp/tools/mcp-utils.ts b/packages/server/api/src/app/mcp/tools/mcp-utils.ts
index 97606d74269..a982f874ff1 100644
--- a/packages/server/api/src/app/mcp/tools/mcp-utils.ts
+++ b/packages/server/api/src/app/mcp/tools/mcp-utils.ts
@@ -245,6 +245,22 @@ async function rejectUnknownInputProps(params: DetectUnknownInputPropsParams): P
return { content: [{ type: 'text', text: `❌ ${message}` }] }
}
+async function dropUnknownInputProps(params: DetectUnknownInputPropsParams): Promise<{ input: Record<string, unknown>, unknownKeys: string[], message: string }> {
+ const input = isObject(params.input) ? params.input : {}
+ const { unknownKeys, message } = await detectUnknownInputProps(params)
+ const knownInput = Object.fromEntries(Object.entries(input).filter(([key]) => !unknownKeys.includes(key)))
+ return { input: knownInput, unknownKeys, message }
+}
+
+async function keepKnownInputProps({ callerInput, ...params }: DetectUnknownInputPropsParams & { callerInput: Record<string, unknown> }): Promise<{ input: Record<string, unknown>, error: McpToolResult | null }> {
+ const { input, unknownKeys } = await dropUnknownInputProps(params)
+ const callerSentUnknownKey = unknownKeys.some((key) => key in callerInput)
+ if (callerSentUnknownKey) {
+ return { input, error: await rejectUnknownInputProps({ ...params, input: callerInput }) }
+ }
+ return { input, error: null }
+}
+
const MAX_PROP_DEPTH = 3
function buildPropSummaries(props: PiecePropertyMap, depth = 0): PropSummary[] {
@@ -807,6 +823,8 @@ export const mcpUtils = {
coerceEmptyContainerInputs,
detectUnknownInputProps,
rejectUnknownInputProps,
+ dropUnknownInputProps,
+ keepKnownInputProps,
buildPropSummaries,
buildExampleInput,
buildRequiredInputs,
diff --git a/packages/server/api/test/integration/ce/mcp/mcp-tools.test.ts b/packages/server/api/test/integration/ce/mcp/mcp-tools.test.ts
index 12a44c9c9ac..1099ff575d9 100644
--- a/packages/server/api/test/integration/ce/mcp/mcp-tools.test.ts
+++ b/packages/server/api/test/integration/ce/mcp/mcp-tools.test.ts
@@ -1,5 +1,5 @@
import { apId } from '@activepieces/core-utils'
-import { FlowActionType, FlowCreatorType, FlowRunStatus, McpServerType, PackageType, PieceType, ProjectScopedMcpServer, RunEnvironment, StepLocationRelativeToParent } from '@activepieces/shared'
+import { FlowActionType, FlowCreatorType, FlowOperationType, FlowRunStatus, flowStructureUtil, FlowTriggerType, McpServerType, PackageType, PieceType, ProjectScopedMcpServer, RunEnvironment, StepLocationRelativeToParent } from '@activepieces/shared'
import { FastifyBaseLogger, FastifyInstance } from 'fastify'
import { StatusCodes } from 'http-status-codes'
import { afterAll, beforeAll, describe, expect, it } from 'vitest'
@@ -79,6 +79,16 @@ beforeAll(async () => {
label: { type: 'SHORT_TEXT', displayName: 'Label', required: false },
},
},
+ new_labeled_email: {
+ name: 'new_labeled_email',
+ displayName: 'New Labeled Email',
+ description: 'Triggers on new email with a label',
+ requireAuth: false,
+ props: {
+ folder: { type: 'SHORT_TEXT', displayName: 'Folder', required: false },
+ label: { type: 'SHORT_TEXT', displayName: 'Label', required: true },
+ },
+ },
new_attachment: {
name: 'new_attachment',
displayName: 'New Attachment',
@@ -2738,4 +2748,60 @@ describe('MCP Tools integration', () => {
expect(flow?.folderId).toBeNull()
expect(text(created)).not.toContain('in folder')
})
+
+ it('ap_build_flow drops unknown properties from steps that are not valid yet, so a later update is not rejected for them', async () => {
+ const ctx = await createTestContext(app)
+ const mcp = makeMcp(ctx.project.id)
+
+ const built = await apBuildFlowTool({ mcp }, mockLog).execute({
+ flowName: 'Unknown props',
+ trigger: { pieceName: '@activepieces/piece-test-email', triggerName: 'new_labeled_email', input: { folder: 'INBOX', method: 'POST' } },
+ steps: [{ type: FlowActionType.PIECE, displayName: 'Send', pieceName: '@activepieces/piece-test-email', actionName: 'send_email', input: { to: '[email protected]', bogus: 'x' } }],
+ })
+ const { flowId } = structured({ result: built, schema: z.object({ flowId: z.string() }) })
+ const builtFlow = await flowService(mockLog).getOnePopulatedOrThrow({ id: flowId, projectId: ctx.project.id })
+
+ const triggerUpdate = await apUpdateTriggerTool({ mcp }, mockLog).execute({ flowId, pieceName: '@activepieces/piece-test-email', triggerName: 'new_labeled_email', input: { label: 'urgent' } })
+ const stepUpdate = await apUpdateStepTool({ mcp }, mockLog).execute({ flowId, stepName: 'step_1', input: { subject: 'Hello' } })
+ const rejected = await apUpdateStepTool({ mcp }, mockLog).execute({ flowId, stepName: 'step_1', input: { nope: 'x' } })
+ const updatedFlow = await flowService(mockLog).getOnePopulatedOrThrow({ id: flowId, projectId: ctx.project.id })
+
+ expect(text(built)).toContain('dropped')
+ expect(builtFlow.version.trigger.valid).toBe(false)
+ expect(builtFlow.version.trigger.settings.input).not.toHaveProperty('method')
+ expect(flowStructureUtil.getStepOrThrow('step_1', builtFlow.version.trigger).settings.input).not.toHaveProperty('bogus')
+ expect(text(triggerUpdate)).not.toContain('Unknown properties')
+ expect(text(stepUpdate)).not.toContain('Unknown properties')
+ expect(text(rejected)).toContain("Unknown properties: 'nope'")
+ expect(updatedFlow.version.trigger.settings.input).toMatchObject({ folder: 'INBOX', label: 'urgent' })
+ expect(flowStructureUtil.getStepOrThrow('step_1', updatedFlow.version.trigger).settings.input).toMatchObject({ to: '[email protected]', subject: 'Hello' })
+ })
+
+ it('ap_update_trigger clears a stale unknown property saved on a trigger that is not valid yet', async () => {
+ const ctx = await createTestContext(app)
+ const mcp = makeMcp(ctx.project.id)
+ const flowId = await createFlowAndGetId(mcp, 'Stale props')
+ const flow = await flowService(mockLog).getOnePopulatedOrThrow({ id: flowId, projectId: ctx.project.id })
+ await flowService(mockLog).update({
+ id: flowId, projectId: ctx.project.id, userId: null, platformId: ctx.platform.id,
+ operation: {
+ type: FlowOperationType.UPDATE_TRIGGER,
+ request: {
+ name: flow.version.trigger.name,
+ displayName: 'New Labeled Email',
+ valid: false,
+ type: FlowTriggerType.PIECE,
+ settings: { pieceName: '@activepieces/piece-test-email', pieceVersion: '0.1.0', triggerName: 'new_labeled_email', input: { folder: 'INBOX', method: 'POST' }, propertySettings: {} },
+ },
+ },
+ })
+ const stale = await flowService(mockLog).getOnePopulatedOrThrow({ id: flowId, projectId: ctx.project.id })
+
+ const triggerUpdate = await apUpdateTriggerTool({ mcp }, mockLog).execute({ flowId, pieceName: '@activepieces/piece-test-email', triggerName: 'new_labeled_email', input: { label: 'urgent' } })
+ const updatedFlow = await flowService(mockLog).getOnePopulatedOrThrow({ id: flowId, projectId: ctx.project.id })
+
+ expect(stale.version.trigger.settings.input).toHaveProperty('method')
+ expect(text(triggerUpdate)).not.toContain('Unknown properties')
+ expect(updatedFlow.version.trigger.settings.input).toEqual({ folder: 'INBOX', label: 'urgent' })
+ })
})