mirror of
https://github.com/czlonkowski/n8n-mcp.git
synced 2026-03-20 17:33:08 +00:00
fix: resolve multiple n8n_update_partial_workflow bugs (#635)
* fix: use correct MCP SDK API for server capabilities in test getServerVersion() returns Implementation (name/version only), not the full init result. Use client.getServerCapabilities() instead to access server capabilities, fixing the CI typecheck failure. Concieved by Romuald Członkowski - www.aiadvisors.pl/en Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: resolve multiple n8n_update_partial_workflow bugs (#592, #599, #610, #623, #624, #625, #629, #630, #633) Phase 1 - Data loss prevention: - Add missing unary operators (empty, notEmpty, exists, notExists) to sanitizer (#592) - Preserve positional empty arrays in connections during removeNode/cleanStale (#610) - Scope sanitization to modified nodes only, preventing unrelated node corruption - Add empty body {} to activate/deactivate POST calls to fix 415 errors (#633) Phase 2 - Error handling & response clarity: - Serialize Zod errors to readable "path: message" strings (#630) - Add saved:true/false field to all response paths (#625) - Improve updateNode error hint with correct structure example (#623) - Track removed node names for better removeConnection errors (#624) Phase 3 - Connection & type fixes: - Coerce sourceOutput/targetInput to String() consistently (#629) - Accept numeric sourceOutput/targetInput at Zod schema level via transform Phase 4 - Tag operations via dedicated API (#599): - Track tags as tagsToAdd/tagsToRemove instead of mutating workflow.tags - Orchestrate tag creation and association via listTags/createTag/updateWorkflowTags - Reconcile conflicting add/remove for same tag (last operation wins) - Tag failures produce warnings, not hard errors Conceived by Romuald Członkowski - www.aiadvisors.pl/en Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * docs: add v2.37.0 changelog entry Conceived by Romuald Członkowski - www.aiadvisors.pl/en Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: resolve pre-existing integration test failures in CI - Create new MCP Server instance per connection in test helpers (SDK 1.27+ requires separate Protocol instance per connection) - Normalize database paths with path.resolve() in shared-database singleton to prevent path mismatch errors across test files - Add no-op catch handler to deferred initialization promise in server.ts to prevent unhandled rejection warnings - Properly call mcpServer.shutdown() in test helper close() to release shared database references Conceived by Romuald Członkowski - www.aiadvisors.pl/en Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
Romuald Członkowski
committed by
GitHub
GitHub
parent
248f859c49
commit
9590f751d2
@@ -11,6 +11,7 @@
|
||||
* Issue: https://github.com/czlonkowski/n8n-mcp/issues/XXX
|
||||
*/
|
||||
|
||||
import path from 'path';
|
||||
import { DatabaseAdapter, createDatabaseAdapter } from './database-adapter';
|
||||
import { NodeRepository } from './node-repository';
|
||||
import { TemplateService } from '../templates/template-service';
|
||||
@@ -43,21 +44,26 @@ let initializationPromise: Promise<SharedDatabaseState> | null = null;
|
||||
* @returns Shared database state with connection and services
|
||||
*/
|
||||
export async function getSharedDatabase(dbPath: string): Promise<SharedDatabaseState> {
|
||||
// Normalize to a canonical absolute path so that callers using different
|
||||
// relative or join-based paths (e.g. "./data/nodes.db" vs an absolute path)
|
||||
// resolve to the same string and do not trigger a false "different path" error.
|
||||
const normalizedPath = dbPath === ':memory:' ? dbPath : path.resolve(dbPath);
|
||||
|
||||
// If already initialized with the same path, increment ref count and return
|
||||
if (sharedState && sharedState.initialized && sharedState.dbPath === dbPath) {
|
||||
if (sharedState && sharedState.initialized && sharedState.dbPath === normalizedPath) {
|
||||
sharedState.refCount++;
|
||||
logger.debug('Reusing shared database connection', {
|
||||
refCount: sharedState.refCount,
|
||||
dbPath
|
||||
dbPath: normalizedPath
|
||||
});
|
||||
return sharedState;
|
||||
}
|
||||
|
||||
// If already initialized with a DIFFERENT path, this is a configuration error
|
||||
if (sharedState && sharedState.initialized && sharedState.dbPath !== dbPath) {
|
||||
if (sharedState && sharedState.initialized && sharedState.dbPath !== normalizedPath) {
|
||||
logger.error('Attempted to initialize shared database with different path', {
|
||||
existingPath: sharedState.dbPath,
|
||||
requestedPath: dbPath
|
||||
requestedPath: normalizedPath
|
||||
});
|
||||
throw new Error(`Shared database already initialized with different path: ${sharedState.dbPath}`);
|
||||
}
|
||||
@@ -69,7 +75,7 @@ export async function getSharedDatabase(dbPath: string): Promise<SharedDatabaseS
|
||||
state.refCount++;
|
||||
logger.debug('Reusing shared database (waited for init)', {
|
||||
refCount: state.refCount,
|
||||
dbPath
|
||||
dbPath: normalizedPath
|
||||
});
|
||||
return state;
|
||||
} catch (error) {
|
||||
@@ -80,7 +86,7 @@ export async function getSharedDatabase(dbPath: string): Promise<SharedDatabaseS
|
||||
}
|
||||
|
||||
// Start new initialization
|
||||
initializationPromise = initializeSharedDatabase(dbPath);
|
||||
initializationPromise = initializeSharedDatabase(normalizedPath);
|
||||
|
||||
try {
|
||||
const state = await initializationPromise;
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
import { z } from 'zod';
|
||||
import { McpToolResponse } from '../types/n8n-api';
|
||||
import { WorkflowDiffRequest, WorkflowDiffOperation } from '../types/workflow-diff';
|
||||
import { WorkflowDiffRequest, WorkflowDiffOperation, WorkflowDiffValidationError } from '../types/workflow-diff';
|
||||
import { WorkflowDiffEngine } from '../services/workflow-diff-engine';
|
||||
import { getN8nApiClient } from './handlers-n8n-manager';
|
||||
import { N8nApiError, getUserFriendlyErrorMessage } from '../utils/n8n-errors';
|
||||
@@ -48,8 +48,8 @@ const workflowDiffSchema = z.object({
|
||||
target: z.string().optional(),
|
||||
from: z.string().optional(), // For rewireConnection
|
||||
to: z.string().optional(), // For rewireConnection
|
||||
sourceOutput: z.string().optional(),
|
||||
targetInput: z.string().optional(),
|
||||
sourceOutput: z.union([z.string(), z.number()]).transform(String).optional(),
|
||||
targetInput: z.union([z.string(), z.number()]).transform(String).optional(),
|
||||
sourceIndex: z.number().optional(),
|
||||
targetIndex: z.number().optional(),
|
||||
// Smart parameters (Phase 1 UX improvement)
|
||||
@@ -178,11 +178,12 @@ export async function handleUpdatePartialWorkflow(
|
||||
// Complete failure - return error
|
||||
return {
|
||||
success: false,
|
||||
saved: false,
|
||||
error: 'Failed to apply diff operations',
|
||||
operationsApplied: diffResult.operationsApplied,
|
||||
details: {
|
||||
errors: diffResult.errors,
|
||||
warnings: diffResult.warnings,
|
||||
operationsApplied: diffResult.operationsApplied,
|
||||
applied: diffResult.applied,
|
||||
failed: diffResult.failed
|
||||
}
|
||||
@@ -265,6 +266,7 @@ export async function handleUpdatePartialWorkflow(
|
||||
if (!skipValidation) {
|
||||
return {
|
||||
success: false,
|
||||
saved: false,
|
||||
error: errorMessage,
|
||||
details: {
|
||||
errors: structureErrors,
|
||||
@@ -273,7 +275,7 @@ export async function handleUpdatePartialWorkflow(
|
||||
applied: diffResult.applied,
|
||||
recoveryGuidance: recoverySteps,
|
||||
note: 'Operations were applied but created an invalid workflow structure. The workflow was NOT saved to n8n to prevent UI rendering errors.',
|
||||
autoSanitizationNote: 'Auto-sanitization runs on all nodes during updates to fix operator structures and add missing metadata. However, it cannot fix all issues (e.g., broken connections, branch mismatches). Use the recovery guidance above to resolve remaining issues.'
|
||||
autoSanitizationNote: 'Auto-sanitization runs on modified nodes during updates to fix operator structures and add missing metadata. However, it cannot fix all issues (e.g., broken connections, branch mismatches). Use the recovery guidance above to resolve remaining issues.'
|
||||
}
|
||||
};
|
||||
}
|
||||
@@ -289,6 +291,63 @@ export async function handleUpdatePartialWorkflow(
|
||||
try {
|
||||
const updatedWorkflow = await client.updateWorkflow(input.id, diffResult.workflow!);
|
||||
|
||||
// Handle tag operations via dedicated API (#599)
|
||||
let tagWarnings: string[] = [];
|
||||
if (diffResult.tagsToAdd?.length || diffResult.tagsToRemove?.length) {
|
||||
try {
|
||||
// Get existing tags from the updated workflow
|
||||
const existingTags: Array<{ id: string; name: string }> = Array.isArray(updatedWorkflow.tags)
|
||||
? updatedWorkflow.tags.map((t: any) => typeof t === 'object' ? { id: t.id, name: t.name } : { id: '', name: t })
|
||||
: [];
|
||||
|
||||
// Resolve tag names to IDs
|
||||
const allTags = await client.listTags();
|
||||
const tagMap = new Map<string, string>();
|
||||
for (const t of allTags.data) {
|
||||
if (t.id) tagMap.set(t.name.toLowerCase(), t.id);
|
||||
}
|
||||
|
||||
// Create any tags that don't exist yet
|
||||
for (const tagName of (diffResult.tagsToAdd || [])) {
|
||||
if (!tagMap.has(tagName.toLowerCase())) {
|
||||
try {
|
||||
const newTag = await client.createTag({ name: tagName });
|
||||
if (newTag.id) tagMap.set(tagName.toLowerCase(), newTag.id);
|
||||
} catch (createErr) {
|
||||
tagWarnings.push(`Failed to create tag "${tagName}": ${createErr instanceof Error ? createErr.message : 'Unknown error'}`);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Compute final tag set — resolve string-type tags via tagMap
|
||||
const currentTagIds = new Set<string>();
|
||||
for (const et of existingTags) {
|
||||
if (et.id) {
|
||||
currentTagIds.add(et.id);
|
||||
} else {
|
||||
const resolved = tagMap.get(et.name.toLowerCase());
|
||||
if (resolved) currentTagIds.add(resolved);
|
||||
}
|
||||
}
|
||||
|
||||
for (const tagName of (diffResult.tagsToAdd || [])) {
|
||||
const tagId = tagMap.get(tagName.toLowerCase());
|
||||
if (tagId) currentTagIds.add(tagId);
|
||||
}
|
||||
|
||||
for (const tagName of (diffResult.tagsToRemove || [])) {
|
||||
const tagId = tagMap.get(tagName.toLowerCase());
|
||||
if (tagId) currentTagIds.delete(tagId);
|
||||
}
|
||||
|
||||
// Update workflow tags via dedicated API
|
||||
await client.updateWorkflowTags(input.id, Array.from(currentTagIds));
|
||||
} catch (tagError) {
|
||||
tagWarnings.push(`Tag update failed: ${tagError instanceof Error ? tagError.message : 'Unknown error'}`);
|
||||
logger.warn('Tag operations failed (non-blocking)', tagError);
|
||||
}
|
||||
}
|
||||
|
||||
// Handle activation/deactivation if requested
|
||||
let finalWorkflow = updatedWorkflow;
|
||||
let activationMessage = '';
|
||||
@@ -319,6 +378,7 @@ export async function handleUpdatePartialWorkflow(
|
||||
logger.error('Failed to activate workflow after update', activationError);
|
||||
return {
|
||||
success: false,
|
||||
saved: true,
|
||||
error: 'Workflow updated successfully but activation failed',
|
||||
details: {
|
||||
workflowUpdated: true,
|
||||
@@ -334,6 +394,7 @@ export async function handleUpdatePartialWorkflow(
|
||||
logger.error('Failed to deactivate workflow after update', deactivationError);
|
||||
return {
|
||||
success: false,
|
||||
saved: true,
|
||||
error: 'Workflow updated successfully but deactivation failed',
|
||||
details: {
|
||||
workflowUpdated: true,
|
||||
@@ -363,6 +424,7 @@ export async function handleUpdatePartialWorkflow(
|
||||
|
||||
return {
|
||||
success: true,
|
||||
saved: true,
|
||||
data: {
|
||||
id: finalWorkflow.id,
|
||||
name: finalWorkflow.name,
|
||||
@@ -375,7 +437,7 @@ export async function handleUpdatePartialWorkflow(
|
||||
applied: diffResult.applied,
|
||||
failed: diffResult.failed,
|
||||
errors: diffResult.errors,
|
||||
warnings: diffResult.warnings
|
||||
warnings: mergeWarnings(diffResult.warnings, tagWarnings)
|
||||
}
|
||||
};
|
||||
} catch (error) {
|
||||
@@ -413,7 +475,9 @@ export async function handleUpdatePartialWorkflow(
|
||||
return {
|
||||
success: false,
|
||||
error: 'Invalid input',
|
||||
details: { errors: error.errors }
|
||||
details: {
|
||||
errors: error.errors.map(e => `${e.path.join('.')}: ${e.message}`)
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
@@ -425,6 +489,21 @@ export async function handleUpdatePartialWorkflow(
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Merge diff engine warnings with tag operation warnings into a single array.
|
||||
* Returns undefined when there are no warnings to keep the response clean.
|
||||
*/
|
||||
function mergeWarnings(
|
||||
diffWarnings: WorkflowDiffValidationError[] | undefined,
|
||||
tagWarnings: string[]
|
||||
): WorkflowDiffValidationError[] | undefined {
|
||||
const merged: WorkflowDiffValidationError[] = [
|
||||
...(diffWarnings || []),
|
||||
...tagWarnings.map(w => ({ operation: -1, message: w }))
|
||||
];
|
||||
return merged.length > 0 ? merged : undefined;
|
||||
}
|
||||
|
||||
/**
|
||||
* Infer intent from operations when not explicitly provided
|
||||
*/
|
||||
|
||||
@@ -210,6 +210,13 @@ export class N8NDocumentationMCPServer {
|
||||
}
|
||||
});
|
||||
|
||||
// Attach a no-op catch handler to prevent Node.js from flagging this as an
|
||||
// unhandled rejection in the interval between construction and the first
|
||||
// await of this.initialized (via ensureInitialized). This does NOT suppress
|
||||
// the error: the original this.initialized promise still rejects, and
|
||||
// ensureInitialized() will re-throw it when awaited.
|
||||
this.initialized.catch(() => {});
|
||||
|
||||
logger.info('Initializing n8n Documentation MCP server');
|
||||
|
||||
this.server = new Server(
|
||||
|
||||
@@ -254,7 +254,7 @@ export class N8nApiClient {
|
||||
|
||||
async activateWorkflow(id: string): Promise<Workflow> {
|
||||
try {
|
||||
const response = await this.client.post(`/workflows/${id}/activate`);
|
||||
const response = await this.client.post(`/workflows/${id}/activate`, {});
|
||||
return response.data;
|
||||
} catch (error) {
|
||||
throw handleN8nApiError(error);
|
||||
@@ -263,7 +263,7 @@ export class N8nApiClient {
|
||||
|
||||
async deactivateWorkflow(id: string): Promise<Workflow> {
|
||||
try {
|
||||
const response = await this.client.post(`/workflows/${id}/deactivate`);
|
||||
const response = await this.client.post(`/workflows/${id}/deactivate`, {});
|
||||
return response.data;
|
||||
} catch (error) {
|
||||
throw handleN8nApiError(error);
|
||||
@@ -493,6 +493,15 @@ export class N8nApiClient {
|
||||
}
|
||||
}
|
||||
|
||||
async updateWorkflowTags(workflowId: string, tagIds: string[]): Promise<Tag[]> {
|
||||
try {
|
||||
const response = await this.client.put(`/workflows/${workflowId}/tags`, tagIds.filter(id => id).map(id => ({ id })));
|
||||
return response.data;
|
||||
} catch (error) {
|
||||
throw handleN8nApiError(error);
|
||||
}
|
||||
}
|
||||
|
||||
// Source Control Management (Enterprise feature)
|
||||
async getSourceControlStatus(): Promise<SourceControlStatus> {
|
||||
try {
|
||||
|
||||
@@ -41,7 +41,7 @@ export function sanitizeWorkflowNodes(workflow: any): any {
|
||||
|
||||
return {
|
||||
...workflow,
|
||||
nodes: workflow.nodes.map((node: any) => sanitizeNode(node))
|
||||
nodes: workflow.nodes.map(sanitizeNode)
|
||||
};
|
||||
}
|
||||
|
||||
@@ -121,9 +121,7 @@ function sanitizeFilterConditions(conditions: any): any {
|
||||
|
||||
// Sanitize conditions array
|
||||
if (sanitized.conditions && Array.isArray(sanitized.conditions)) {
|
||||
sanitized.conditions = sanitized.conditions.map((condition: any) =>
|
||||
sanitizeCondition(condition)
|
||||
);
|
||||
sanitized.conditions = sanitized.conditions.map(sanitizeCondition);
|
||||
}
|
||||
|
||||
return sanitized;
|
||||
@@ -214,18 +212,25 @@ function inferDataType(operation: string): string {
|
||||
return 'boolean';
|
||||
}
|
||||
|
||||
// Number operations
|
||||
// Number operations (partial match to catch variants like "greaterThan" containing "gt")
|
||||
const numberOps = ['isNumeric', 'gt', 'gte', 'lt', 'lte'];
|
||||
if (numberOps.some(op => operation.includes(op))) {
|
||||
return 'number';
|
||||
}
|
||||
|
||||
// Date operations
|
||||
// Date operations (partial match to catch variants like "isAfter" containing "after")
|
||||
const dateOps = ['after', 'before', 'afterDate', 'beforeDate'];
|
||||
if (dateOps.some(op => operation.includes(op))) {
|
||||
return 'dateTime';
|
||||
}
|
||||
|
||||
// Object operations: empty/notEmpty/exists/notExists are generic object-level checks
|
||||
// (distinct from isEmpty/isNotEmpty which are boolean-typed operations)
|
||||
const objectOps = ['empty', 'notEmpty', 'exists', 'notExists'];
|
||||
if (objectOps.includes(operation)) {
|
||||
return 'object';
|
||||
}
|
||||
|
||||
// Default to string
|
||||
return 'string';
|
||||
}
|
||||
@@ -239,7 +244,11 @@ function isUnaryOperator(operation: string): boolean {
|
||||
'isNotEmpty',
|
||||
'true',
|
||||
'false',
|
||||
'isNumeric'
|
||||
'isNumeric',
|
||||
'empty',
|
||||
'notEmpty',
|
||||
'exists',
|
||||
'notExists'
|
||||
];
|
||||
return unaryOps.includes(operation);
|
||||
}
|
||||
|
||||
@@ -38,11 +38,22 @@ import { isActivatableTrigger } from '../utils/node-type-utils';
|
||||
|
||||
const logger = new Logger({ prefix: '[WorkflowDiffEngine]' });
|
||||
|
||||
/**
|
||||
* Not safe for concurrent use — create a new instance per request.
|
||||
* Instance state is reset at the start of each applyDiff() call.
|
||||
*/
|
||||
export class WorkflowDiffEngine {
|
||||
// Track node name changes during operations for connection reference updates
|
||||
private renameMap: Map<string, string> = new Map();
|
||||
// Track warnings during operation processing
|
||||
private warnings: WorkflowDiffValidationError[] = [];
|
||||
// Track which nodes were added/updated so sanitization only runs on them
|
||||
private modifiedNodeIds = new Set<string>();
|
||||
// Track removed node names for better error messages
|
||||
private removedNodeNames = new Set<string>();
|
||||
// Track tag operations for dedicated API calls
|
||||
private tagsToAdd: string[] = [];
|
||||
private tagsToRemove: string[] = [];
|
||||
|
||||
/**
|
||||
* Apply diff operations to a workflow
|
||||
@@ -55,6 +66,10 @@ export class WorkflowDiffEngine {
|
||||
// Reset tracking for this diff operation
|
||||
this.renameMap.clear();
|
||||
this.warnings = [];
|
||||
this.modifiedNodeIds.clear();
|
||||
this.removedNodeNames.clear();
|
||||
this.tagsToAdd = [];
|
||||
this.tagsToRemove = [];
|
||||
|
||||
// Clone workflow to avoid modifying original
|
||||
const workflowCopy = JSON.parse(JSON.stringify(workflow));
|
||||
@@ -135,7 +150,9 @@ export class WorkflowDiffEngine {
|
||||
errors: errors.length > 0 ? errors : undefined,
|
||||
warnings: this.warnings.length > 0 ? this.warnings : undefined,
|
||||
applied: appliedIndices,
|
||||
failed: failedIndices
|
||||
failed: failedIndices,
|
||||
tagsToAdd: this.tagsToAdd.length > 0 ? this.tagsToAdd : undefined,
|
||||
tagsToRemove: this.tagsToRemove.length > 0 ? this.tagsToRemove : undefined
|
||||
};
|
||||
} else {
|
||||
// Atomic mode: all operations must succeed
|
||||
@@ -201,12 +218,16 @@ export class WorkflowDiffEngine {
|
||||
}
|
||||
}
|
||||
|
||||
// Sanitize ALL nodes in the workflow after operations are applied
|
||||
// This ensures existing invalid nodes (e.g., binary operators with singleValue: true)
|
||||
// are fixed automatically when any update is made to the workflow
|
||||
workflowCopy.nodes = workflowCopy.nodes.map((node: WorkflowNode) => sanitizeNode(node));
|
||||
|
||||
logger.debug('Applied full-workflow sanitization to all nodes');
|
||||
// Sanitize only modified nodes to avoid breaking unrelated nodes (#592)
|
||||
if (this.modifiedNodeIds.size > 0) {
|
||||
workflowCopy.nodes = workflowCopy.nodes.map((node: WorkflowNode) => {
|
||||
if (this.modifiedNodeIds.has(node.id)) {
|
||||
return sanitizeNode(node);
|
||||
}
|
||||
return node;
|
||||
});
|
||||
logger.debug(`Sanitized ${this.modifiedNodeIds.size} modified nodes`);
|
||||
}
|
||||
|
||||
// If validateOnly flag is set, return success without applying
|
||||
if (request.validateOnly) {
|
||||
@@ -233,7 +254,9 @@ export class WorkflowDiffEngine {
|
||||
message: `Successfully applied ${operationsApplied} operations (${nodeOperations.length} node ops, ${otherOperations.length} other ops)`,
|
||||
warnings: this.warnings.length > 0 ? this.warnings : undefined,
|
||||
shouldActivate: shouldActivate || undefined,
|
||||
shouldDeactivate: shouldDeactivate || undefined
|
||||
shouldDeactivate: shouldDeactivate || undefined,
|
||||
tagsToAdd: this.tagsToAdd.length > 0 ? this.tagsToAdd : undefined,
|
||||
tagsToRemove: this.tagsToRemove.length > 0 ? this.tagsToRemove : undefined
|
||||
};
|
||||
}
|
||||
} catch (error) {
|
||||
@@ -248,7 +271,6 @@ export class WorkflowDiffEngine {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Validate a single operation
|
||||
*/
|
||||
@@ -405,7 +427,7 @@ export class WorkflowDiffEngine {
|
||||
|
||||
// Check for missing required parameter
|
||||
if (!operation.updates) {
|
||||
return `Missing required parameter 'updates'. The updateNode operation requires an 'updates' object containing properties to modify. Example: {type: "updateNode", nodeId: "abc", updates: {name: "New Name"}}`;
|
||||
return `Missing required parameter 'updates'. The updateNode operation requires an 'updates' object. Correct structure: {type: "updateNode", nodeId: "abc-123" OR nodeName: "My Node", updates: {name: "New Name", "parameters.url": "https://example.com"}}`;
|
||||
}
|
||||
|
||||
const node = this.findNode(workflow, operation.nodeId, operation.nodeName);
|
||||
@@ -510,12 +532,18 @@ export class WorkflowDiffEngine {
|
||||
const targetNode = this.findNode(workflow, operation.target, operation.target);
|
||||
|
||||
if (!sourceNode) {
|
||||
if (this.removedNodeNames.has(operation.source)) {
|
||||
return `Source node "${operation.source}" was already removed by a prior removeNode operation. Its connections were automatically cleaned up — no separate removeConnection needed.`;
|
||||
}
|
||||
const availableNodes = workflow.nodes
|
||||
.map(n => `"${n.name}" (id: ${n.id.substring(0, 8)}...)`)
|
||||
.join(', ');
|
||||
return `Source node not found: "${operation.source}". Available nodes: ${availableNodes}. Tip: Use node ID for names with special characters.`;
|
||||
}
|
||||
if (!targetNode) {
|
||||
if (this.removedNodeNames.has(operation.target)) {
|
||||
return `Target node "${operation.target}" was already removed by a prior removeNode operation. Its connections were automatically cleaned up — no separate removeConnection needed.`;
|
||||
}
|
||||
const availableNodes = workflow.nodes
|
||||
.map(n => `"${n.name}" (id: ${n.id.substring(0, 8)}...)`)
|
||||
.join(', ');
|
||||
@@ -614,13 +642,16 @@ export class WorkflowDiffEngine {
|
||||
// Sanitize node to ensure complete metadata (filter options, operator structure, etc.)
|
||||
const sanitizedNode = sanitizeNode(newNode);
|
||||
|
||||
this.modifiedNodeIds.add(sanitizedNode.id);
|
||||
workflow.nodes.push(sanitizedNode);
|
||||
}
|
||||
|
||||
private applyRemoveNode(workflow: Workflow, operation: RemoveNodeOperation): void {
|
||||
const node = this.findNode(workflow, operation.nodeId, operation.nodeName);
|
||||
if (!node) return;
|
||||
|
||||
|
||||
this.removedNodeNames.add(node.name);
|
||||
|
||||
// Remove node from array
|
||||
const index = workflow.nodes.findIndex(n => n.id === node.id);
|
||||
if (index !== -1) {
|
||||
@@ -631,30 +662,36 @@ export class WorkflowDiffEngine {
|
||||
delete workflow.connections[node.name];
|
||||
|
||||
// Remove all connections to this node
|
||||
Object.keys(workflow.connections).forEach(sourceName => {
|
||||
const sourceConnections = workflow.connections[sourceName];
|
||||
Object.keys(sourceConnections).forEach(outputName => {
|
||||
sourceConnections[outputName] = sourceConnections[outputName].map(connections =>
|
||||
for (const [sourceName, sourceConnections] of Object.entries(workflow.connections)) {
|
||||
for (const [outputName, outputConns] of Object.entries(sourceConnections)) {
|
||||
sourceConnections[outputName] = outputConns.map(connections =>
|
||||
connections.filter(conn => conn.node !== node.name)
|
||||
).filter(connections => connections.length > 0);
|
||||
|
||||
// Clean up empty arrays
|
||||
if (sourceConnections[outputName].length === 0) {
|
||||
);
|
||||
|
||||
// Trim trailing empty arrays only (preserve intermediate empty arrays for positional indices)
|
||||
const trimmed = sourceConnections[outputName];
|
||||
while (trimmed.length > 0 && trimmed[trimmed.length - 1].length === 0) {
|
||||
trimmed.pop();
|
||||
}
|
||||
|
||||
if (trimmed.length === 0) {
|
||||
delete sourceConnections[outputName];
|
||||
}
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
// Clean up empty connection objects
|
||||
if (Object.keys(sourceConnections).length === 0) {
|
||||
delete workflow.connections[sourceName];
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
private applyUpdateNode(workflow: Workflow, operation: UpdateNodeOperation): void {
|
||||
const node = this.findNode(workflow, operation.nodeId, operation.nodeName);
|
||||
if (!node) return;
|
||||
|
||||
this.modifiedNodeIds.add(node.id);
|
||||
|
||||
// Track node renames for connection reference updates
|
||||
if (operation.updates.name && operation.updates.name !== node.name) {
|
||||
const oldName = node.name;
|
||||
@@ -706,8 +743,8 @@ export class WorkflowDiffEngine {
|
||||
): { sourceOutput: string; sourceIndex: number } {
|
||||
const sourceNode = this.findNode(workflow, operation.source, operation.source);
|
||||
|
||||
// Start with explicit values or defaults
|
||||
let sourceOutput = operation.sourceOutput ?? 'main';
|
||||
// Start with explicit values or defaults, coercing to correct types
|
||||
let sourceOutput = String(operation.sourceOutput ?? 'main');
|
||||
let sourceIndex = operation.sourceIndex ?? 0;
|
||||
|
||||
// Smart parameter: branch (for IF nodes)
|
||||
@@ -758,7 +795,8 @@ export class WorkflowDiffEngine {
|
||||
|
||||
// Use nullish coalescing to properly handle explicit 0 values
|
||||
// Default targetInput to sourceOutput to preserve connection type for AI connections (ai_tool, ai_memory, etc.)
|
||||
const targetInput = operation.targetInput ?? sourceOutput;
|
||||
// Coerce to string to handle numeric values passed as sourceOutput/targetInput
|
||||
const targetInput = String(operation.targetInput ?? sourceOutput);
|
||||
const targetIndex = operation.targetIndex ?? 0;
|
||||
|
||||
// Initialize source node connections object
|
||||
@@ -795,18 +833,14 @@ export class WorkflowDiffEngine {
|
||||
private applyRemoveConnection(workflow: Workflow, operation: RemoveConnectionOperation): void {
|
||||
const sourceNode = this.findNode(workflow, operation.source, operation.source);
|
||||
const targetNode = this.findNode(workflow, operation.target, operation.target);
|
||||
// If ignoreErrors is true, silently succeed even if nodes don't exist
|
||||
if (!sourceNode || !targetNode) {
|
||||
if (operation.ignoreErrors) {
|
||||
return; // Gracefully handle missing nodes
|
||||
}
|
||||
return; // Should never reach here if validation passed, but safety check
|
||||
return;
|
||||
}
|
||||
|
||||
const sourceOutput = operation.sourceOutput || 'main';
|
||||
const sourceOutput = String(operation.sourceOutput ?? 'main');
|
||||
const connections = workflow.connections[sourceNode.name]?.[sourceOutput];
|
||||
if (!connections) return;
|
||||
|
||||
|
||||
// Remove connection from all indices
|
||||
workflow.connections[sourceNode.name][sourceOutput] = connections.map(conns =>
|
||||
conns.filter(conn => conn.node !== targetNode.name)
|
||||
@@ -877,20 +911,26 @@ export class WorkflowDiffEngine {
|
||||
}
|
||||
|
||||
private applyAddTag(workflow: Workflow, operation: AddTagOperation): void {
|
||||
if (!workflow.tags) {
|
||||
workflow.tags = [];
|
||||
// Track for dedicated API call instead of modifying workflow.tags directly
|
||||
// Reconcile: if previously marked for removal, cancel the removal instead
|
||||
const removeIdx = this.tagsToRemove.indexOf(operation.tag);
|
||||
if (removeIdx !== -1) {
|
||||
this.tagsToRemove.splice(removeIdx, 1);
|
||||
}
|
||||
if (!workflow.tags.includes(operation.tag)) {
|
||||
workflow.tags.push(operation.tag);
|
||||
if (!this.tagsToAdd.includes(operation.tag)) {
|
||||
this.tagsToAdd.push(operation.tag);
|
||||
}
|
||||
}
|
||||
|
||||
private applyRemoveTag(workflow: Workflow, operation: RemoveTagOperation): void {
|
||||
if (!workflow.tags) return;
|
||||
|
||||
const index = workflow.tags.indexOf(operation.tag);
|
||||
if (index !== -1) {
|
||||
workflow.tags.splice(index, 1);
|
||||
// Track for dedicated API call instead of modifying workflow.tags directly
|
||||
// Reconcile: if previously marked for addition, cancel the addition instead
|
||||
const addIdx = this.tagsToAdd.indexOf(operation.tag);
|
||||
if (addIdx !== -1) {
|
||||
this.tagsToAdd.splice(addIdx, 1);
|
||||
}
|
||||
if (!this.tagsToRemove.includes(operation.tag)) {
|
||||
this.tagsToRemove.push(operation.tag);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1015,7 +1055,12 @@ export class WorkflowDiffEngine {
|
||||
}
|
||||
return true;
|
||||
})
|
||||
).filter(conns => conns.length > 0);
|
||||
);
|
||||
|
||||
// Trim trailing empty arrays only (preserve intermediate for positional indices)
|
||||
while (filteredConnections.length > 0 && filteredConnections[filteredConnections.length - 1].length === 0) {
|
||||
filteredConnections.pop();
|
||||
}
|
||||
|
||||
if (filteredConnections.length === 0) {
|
||||
delete outputs[outputName];
|
||||
|
||||
@@ -311,6 +311,7 @@ export interface WebhookRequest {
|
||||
// MCP Tool Response Type
|
||||
export interface McpToolResponse {
|
||||
success: boolean;
|
||||
saved?: boolean;
|
||||
data?: unknown;
|
||||
error?: string;
|
||||
message?: string;
|
||||
@@ -318,6 +319,7 @@ export interface McpToolResponse {
|
||||
details?: Record<string, unknown>;
|
||||
executionId?: string;
|
||||
workflowId?: string;
|
||||
operationsApplied?: number;
|
||||
}
|
||||
|
||||
// Execution Filtering Types
|
||||
|
||||
@@ -190,6 +190,8 @@ export interface WorkflowDiffResult {
|
||||
staleConnectionsRemoved?: Array<{ from: string; to: string }>; // For cleanStaleConnections operation
|
||||
shouldActivate?: boolean; // Flag to activate workflow after update (for activateWorkflow operation)
|
||||
shouldDeactivate?: boolean; // Flag to deactivate workflow after update (for deactivateWorkflow operation)
|
||||
tagsToAdd?: string[];
|
||||
tagsToRemove?: string[];
|
||||
}
|
||||
|
||||
// Helper type for node reference (supports both ID and name)
|
||||
|
||||
Reference in New Issue
Block a user