@atom8n/n8n 2.5.1 → 2.5.3

package/dist/commands/mcp.js

@@ -98,7 +98,7 @@ let Mcp = class Mcp extends base_command_1.BaseCommand {
                 this.sanitizeToolName(path_1.default.basename(workflows[0].filePath, '.n8n'))
             : 'n8n MCP Server';
         const server = new McpServer({
-            name: serverName,
+            name: 'n8n MCP Server',
             version: '1.0.0',
         });
         const usedToolNames = new Set();
@@ -116,20 +116,65 @@ let Mcp = class Mcp extends base_command_1.BaseCommand {
                 node.type === 'n8n-nodes-base.start');
             const triggerType = triggerNode?.type ?? 'unknown';
             const isChatTrigger = triggerType === '@n8n/n8n-nodes-langchain.chatTrigger';
+            const isSubFlowTrigger = triggerType === 'n8n-nodes-base.executeWorkflowTrigger';
             this.logStderr(`[mcp] Registering tool "${toolName}" (trigger: ${triggerType})`);
-            const inputSchemaShape = isChatTrigger
-                ? { input: zod_1.z.string().describe('Input text for the chat workflow') }
-                : { input: zod_1.z.string().optional().describe('Input text or data for the workflow') };
+            let inputSchemaShape;
+            let description;
+            if (isSubFlowTrigger) {
+                const params = triggerNode?.parameters;
+                const workflowInputs = (params?.workflowInputs?.values ??
+                    []);
+                inputSchemaShape = {};
+                for (const field of workflowInputs) {
+                    const name = field.name;
+                    if (!name)
+                        continue;
+                    let zodType;
+                    switch (field.type) {
+                        case 'number':
+                            zodType = zod_1.z.number();
+                            break;
+                        case 'boolean':
+                            zodType = zod_1.z.boolean();
+                            break;
+                        default:
+                            zodType = zod_1.z.string();
+                    }
+                    if (field.defaultValue !== undefined && field.defaultValue !== '') {
+                        zodType = zodType.optional().describe(`${name} (default: ${field.defaultValue})`);
+                    }
+                    else {
+                        zodType = zodType.describe(name);
+                    }
+                    inputSchemaShape[name] = zodType;
+                }
+                if (Object.keys(inputSchemaShape).length === 0) {
+                    inputSchemaShape = {
+                        input: zod_1.z.string().optional().describe('Input data for the workflow'),
+                    };
+                }
+                description = `Execute the n8n workflow "${workflowData.name}". Provide the required input parameters.`;
+                this.logStderr(`[mcp]   Sub-flow inputs: ${workflowInputs.map((f) => f.name).join(', ') || '(none)'}`);
+            }
+            else if (isChatTrigger) {
+                inputSchemaShape = { input: zod_1.z.string().describe('Input text for the chat workflow') };
+                description = `Execute the n8n workflow "${workflowData.name}". This is a chat-based workflow — provide input text.`;
+            }
+            else {
+                inputSchemaShape = {
+                    input: zod_1.z.string().optional().describe('Input text or data for the workflow trigger'),
+                };
+                description = `Execute the n8n workflow "${workflowData.name}". Provide optional input text for the workflow trigger.`;
+            }
             const wfData = workflowData;
             const wfIsChatTrigger = isChatTrigger;
+            const wfIsSubFlowTrigger = isSubFlowTrigger;
             const wfToolName = toolName;
             server.registerTool(toolName, {
-                description: `Execute the n8n workflow "${workflowData.name}". ${isChatTrigger
-                    ? 'This is a chat-based workflow — provide input text.'
-                    : 'Provide optional input text for the workflow trigger.'}`,
+                description,
                 inputSchema: inputSchemaShape,
             }, async (args) => {
-                return await this.executeWorkflowTool(wfToolName, wfData, wfIsChatTrigger, serverUrl, args);
+                return await this.executeWorkflowTool(wfToolName, wfData, wfIsChatTrigger, wfIsSubFlowTrigger, serverUrl, args);
             });
         }
         this.logStderr(`[mcp] Registered ${usedToolNames.size} tool(s): ${[...usedToolNames].join(', ')}`);
@@ -149,7 +194,7 @@ let Mcp = class Mcp extends base_command_1.BaseCommand {
         });
         this.logStderr(`[mcp] Server stopped.`);
     }
-    async executeWorkflowTool(toolName, workflowData, isChatTrigger, serverUrl, args) {
+    async executeWorkflowTool(toolName, workflowData, isChatTrigger, isSubFlowTrigger, serverUrl, args) {
         this.logStderr(`[mcp] ── TOOL CALL: "${toolName}" ──`);
         this.logStderr(`[mcp] Input: ${JSON.stringify(args)}`);
         try {
@@ -162,7 +207,10 @@ let Mcp = class Mcp extends base_command_1.BaseCommand {
             const executeUrl = `${serverUrl}/rest/cli/run`;
             this.logStderr(`[mcp] POST ${executeUrl}`);
             const requestBody = { workflowData };
-            if (args.input !== undefined) {
+            if (isSubFlowTrigger) {
+                requestBody.inputData = args;
+            }
+            else if (args.input !== undefined) {
                 if (isChatTrigger) {
                     requestBody.chatInput = String(args.input);
                 }

package/dist/controllers/cli.controller.js

@@ -58,6 +58,7 @@ let CliController = CliController_1 = class CliController {
         const fileData = body.workflowData;
         const chatInput = body.chatInput;
         const inputData = body.inputData;
+        const fileModifiedAt = body.fileModifiedAt;
         this.logger.info(`[cli] inputData: ${inputData ? JSON.stringify(inputData) : '(none)'}`);
         if (!fileData.nodes || !Array.isArray(fileData.nodes)) {
             res.status(400).json({ error: 'Workflow does not contain valid nodes' });
@@ -70,7 +71,7 @@ let CliController = CliController_1 = class CliController {
         this.logger.info(`[cli] Workflow: "${fileData.name}", Nodes: ${fileData.nodes.length}`);
         try {
             const user = await this.ownershipService.getInstanceOwner();
-            const workflowId = await this.syncWorkflow(fileData, user.id);
+            const workflowId = await this.syncWorkflow(fileData, user.id, fileModifiedAt);
             const workflow = await this.workflowRepository.findOneBy({ id: workflowId });
             if (!workflow) {
                 res.status(500).json({ error: 'Failed to sync workflow to database' });
@@ -228,17 +229,19 @@ let CliController = CliController_1 = class CliController {
             });
         }
     }
-    async syncWorkflow(fileData, userId) {
+    async syncWorkflow(fileData, userId, fileModifiedAt) {
         if (fileData.id && (0, utils_1.isWorkflowIdValid)(fileData.id)) {
             const existing = await this.workflowRepository.findOneBy({ id: fileData.id });
             if (existing) {
-                const fileUpdatedAt = fileData.updatedAt
-                    ? new Date(fileData.updatedAt)
-                    : null;
+                const fileUpdatedAt = fileModifiedAt ? new Date(fileModifiedAt) : null;
                 const serverUpdatedAt = existing.updatedAt
                     ? new Date(existing.updatedAt)
                     : null;
-                if (fileUpdatedAt && serverUpdatedAt && fileUpdatedAt > serverUpdatedAt) {
+                this.logger.info(`[cli] Found existing workflow (ID match): ${existing.id}, ` +
+                    `fileUpdatedAt=${fileUpdatedAt?.toISOString() ?? 'null'}, ` +
+                    `serverUpdatedAt=${serverUpdatedAt?.toISOString() ?? 'null'}`);
+                const shouldUpdate = !fileUpdatedAt || !serverUpdatedAt || fileUpdatedAt >= serverUpdatedAt;
+                if (shouldUpdate) {
                     this.logger.info(`[cli] Updating existing workflow (ID match): ${existing.id}`);
                     await this.workflowRepository.update(existing.id, {
                         nodes: fileData.nodes,
@@ -249,7 +252,8 @@ let CliController = CliController_1 = class CliController {
                     });
                 }
                 else {
-                    this.logger.info(`[cli] Using existing workflow (ID match): ${existing.id}`);
+                    this.logger.info(`[cli] Using existing workflow (ID match): ${existing.id} ` +
+                        `(server is newer: ${serverUpdatedAt.toISOString()} > ${fileUpdatedAt.toISOString()})`);
                 }
                 return existing.id;
             }
@@ -257,13 +261,15 @@ let CliController = CliController_1 = class CliController {
         if (fileData.name) {
             const existing = await this.workflowRepository.findOneBy({ name: fileData.name });
             if (existing) {
-                const fileUpdatedAt = fileData.updatedAt
-                    ? new Date(fileData.updatedAt)
-                    : null;
+                const fileUpdatedAt = fileModifiedAt ? new Date(fileModifiedAt) : null;
                 const serverUpdatedAt = existing.updatedAt
                     ? new Date(existing.updatedAt)
                     : null;
-                if (fileUpdatedAt && serverUpdatedAt && fileUpdatedAt > serverUpdatedAt) {
+                this.logger.info(`[cli] Found existing workflow (name match): ${existing.id}, ` +
+                    `fileUpdatedAt=${fileUpdatedAt?.toISOString() ?? 'null'}, ` +
+                    `serverUpdatedAt=${serverUpdatedAt?.toISOString() ?? 'null'}`);
+                const shouldUpdate = !fileUpdatedAt || !serverUpdatedAt || fileUpdatedAt >= serverUpdatedAt;
+                if (shouldUpdate) {
                     this.logger.info(`[cli] Updating existing workflow (name match): ${existing.id}`);
                     await this.workflowRepository.update(existing.id, {
                         nodes: fileData.nodes,
@@ -274,7 +280,8 @@ let CliController = CliController_1 = class CliController {
                     });
                 }
                 else {
-                    this.logger.info(`[cli] Using existing workflow (name match): ${existing.id}`);
+                    this.logger.info(`[cli] Using existing workflow (name match): ${existing.id} ` +
+                        `(server is newer: ${serverUpdatedAt.toISOString()} > ${fileUpdatedAt.toISOString()})`);
                 }
                 return existing.id;
             }