n8n 2.39.4 → 2.40.0

package/dist/modules/instance-ai/instance-ai.adapter.service.js

@@ -90,6 +90,7 @@ const extract_resolved_node_parameters_1 = require("./extract-resolved-node-para
 const instance_ai_folder_scope_1 = require("./instance-ai-folder-scope");
 const instance_ai_run_pin_data_1 = require("./instance-ai-run-pin-data");
 const instance_ai_settings_service_1 = require("./instance-ai-settings.service");
+const instance_context_service_1 = require("./instance-context.service");
 const mcp_1 = require("./mcp");
 const node_definition_resolver_1 = require("./node-definition-resolver");
 const web_research_1 = require("./web-research");
@@ -106,6 +107,13 @@ function resolveDisplayedDefaults(nodeProperties, parameters, nodeType, typeVers
     const resolved = n8n_workflow_1.NodeHelpers.getNodeParameters(nodeProperties, parameters, true, false, stubNode, desc);
     return resolved ?? parameters;
 }
+function credentialDocsUrl(documentationUrl) {
+    if (!documentationUrl)
+        return undefined;
+    if (documentationUrl.startsWith('http'))
+        return documentationUrl;
+    return `https://docs.n8n.io/integrations/builtin/credentials/${documentationUrl}/`;
+}
 function collectCredentialProperties(loadNodesAndCredentials, credentialType) {
     const allTypes = [credentialType];
     const { knownCredentials } = loadNodesAndCredentials;
@@ -165,7 +173,7 @@ let InstanceAiAdapterService = class InstanceAiAdapterService {
         });
         return await promise;
     }
-    constructor(logger, globalConfig, workflowService, workflowFinderService, workflowRepository, sharedWorkflowRepository, projectRepository, executionRepository, credentialsService, credentialsFinderService, activeExecutions, workflowRunner, loadNodesAndCredentials, nodeTypes, instanceSettings, dataTableService, dataTableRepository, nodeResourceExplorerService, folderService, projectService, tagService, instanceWriteAccess, settingsService, workflowHistoryService, enterpriseWorkflowService, license, executionPersistence, eventService, roleService, telemetry, aiBuilderTemporaryWorkflowRepository, outboundHttp, aiGatewayService, workflowTemplatesService, collaborationService, policyEnforcementService, nodeCatalogService, evaluationConfigService, llmJudgeProviderRegistry, workflowDependencyQueryService, folderRepository, folderFinderService) {
+    constructor(logger, globalConfig, workflowService, workflowFinderService, workflowRepository, sharedWorkflowRepository, projectRepository, executionRepository, credentialsService, credentialsFinderService, activeExecutions, workflowRunner, loadNodesAndCredentials, nodeTypes, instanceSettings, dataTableService, dataTableRepository, nodeResourceExplorerService, folderService, projectService, tagService, instanceWriteAccess, settingsService, workflowHistoryService, enterpriseWorkflowService, license, executionPersistence, eventService, roleService, telemetry, aiBuilderTemporaryWorkflowRepository, outboundHttp, aiGatewayService, workflowTemplatesService, collaborationService, policyEnforcementService, nodeCatalogService, evaluationConfigService, llmJudgeProviderRegistry, workflowDependencyQueryService, folderRepository, folderFinderService, instanceContext) {
         this.globalConfig = globalConfig;
         this.workflowService = workflowService;
         this.workflowFinderService = workflowFinderService;
@@ -207,6 +215,7 @@ let InstanceAiAdapterService = class InstanceAiAdapterService {
         this.workflowDependencyQueryService = workflowDependencyQueryService;
         this.folderRepository = folderRepository;
         this.folderFinderService = folderFinderService;
+        this.instanceContext = instanceContext;
         this.nodesCache = null;
         this.NODES_CACHE_TTL_MS = 5 * 60 * 1000;
         this.webResearchCache = new web_research_1.LRUCache({
@@ -248,6 +257,9 @@ let InstanceAiAdapterService = class InstanceAiAdapterService {
                 : {}),
             mcpService: mcpConnectionsEnabled ? this.createMcpAdapter(user) : undefined,
             conversationHistoryService: conversationHistory,
+            ...(this.instanceContext?.enabled
+                ? { activityService: this.createActivityAdapter(user, projectId) }
+                : {}),
             webResearchService: this.createWebResearchAdapter(user, searchProxyConfig),
             workspaceService: this.createWorkspaceAdapter(user),
             templatesService: this.getTemplatesService(),
@@ -262,7 +274,7 @@ let InstanceAiAdapterService = class InstanceAiAdapterService {
                 : {}),
             ...(builderDelegateAdapter && projectId
                 ? {
-                    builderDelegate: builderDelegateAdapter.createDelegate(user, projectId, new agents_credential_provider_1.AgentsCredentialProvider(this.credentialsService, projectId, user), credentialService),
+                    builderDelegate: builderDelegateAdapter.createDelegate(user, projectId, new agents_credential_provider_1.AgentsCredentialProvider(this.credentialsService, projectId, user), credentialService, { useEvalModelCatalog: credentialIdAllowlist !== undefined }),
                 }
                 : {}),
         };
@@ -302,14 +314,38 @@ let InstanceAiAdapterService = class InstanceAiAdapterService {
                 flags[api_types_1.INSTANCE_AI_MCP_CONNECTIONS_FLAG] === api_types_1.INSTANCE_AI_MCP_CONNECTIONS_ENABLED_VARIANT,
             conversationHistoryEnabled: flags[api_types_1.INSTANCE_AI_CONVERSATION_HISTORY_FLAG] ===
                 api_types_1.INSTANCE_AI_CONVERSATION_HISTORY_ENABLED_VARIANT,
+            progressiveBuildingEnabled: flags[api_types_1.INSTANCE_AI_PROGRESSIVE_BUILDING_FLAG] ===
+                api_types_1.INSTANCE_AI_PROGRESSIVE_BUILDING_ENABLED_VARIANT,
             nodeUsageEnabled: flags[api_types_1.INSTANCE_AI_NODE_USAGE_FLAG] === true,
-            folderExplorationEnabled: flags[api_types_1.INSTANCE_AI_FOLDER_EXPLORATION_FLAG] === true,
+            folderExplorationEnabled: flags[api_types_1.INSTANCE_AI_FOLDER_EXPLORATION_FLAG] ===
+                api_types_1.INSTANCE_AI_FOLDER_EXPLORATION_ENABLED_VARIANT,
+            aiPreferencesEnabled: flags[api_types_1.CONTEXT_PREFERENCES_FLAG] === api_types_1.CONTEXT_PREFERENCES_ENABLED_VARIANT,
         };
     }
     mcpPreconditionsHold() {
         return (di_1.Container.get(backend_common_1.ModuleRegistry).isActive('mcp-registry') &&
             this.settingsService.isMcpAccessEnabled());
     }
+    createActivityAdapter(user, projectId) {
+        const instanceContext = this.instanceContext;
+        if (!instanceContext)
+            throw new n8n_workflow_1.UnexpectedError('Instance context service is not available');
+        return {
+            list: async (input) => await instanceContext.list({
+                user,
+                ...(projectId !== undefined ? { projectId } : {}),
+                limit: input.limit,
+                ...(input.category !== undefined ? { category: input.category } : {}),
+                ...(input.resourceId !== undefined ? { resourceId: input.resourceId } : {}),
+                ...(input.beforeId !== undefined ? { beforeId: input.beforeId } : {}),
+            }),
+            expand: async (id) => await instanceContext.expand({
+                id,
+                user,
+                ...(projectId !== undefined ? { projectId } : {}),
+            }),
+        };
+    }
     createMcpAdapter(user) {
         const toSummaries = (servers) => servers
             .filter((server) => !server.isTemplated)
@@ -809,7 +845,11 @@ let InstanceAiAdapterService = class InstanceAiAdapterService {
                 ]);
                 if (!head)
                     throw new instance_ai_1.WorkflowNotFoundError(workflowId);
-                return { versionId: head.versionId, updatedAt: head.updatedAt.getTime() };
+                return {
+                    versionId: head.versionId,
+                    activeVersionId: head.activeVersionId,
+                    updatedAt: head.updatedAt.getTime(),
+                };
             },
             async getWorkflowSnapshot(workflowId) {
                 const wf = await workflowFinderService.findWorkflowForUser(workflowId, user, [
@@ -1127,6 +1167,7 @@ let InstanceAiAdapterService = class InstanceAiAdapterService {
                     startedAt: String(e.startedAt ?? ''),
                     finishedAt: e.stoppedAt ? String(e.stoppedAt) : undefined,
                     mode: e.mode,
+                    workflowVersionId: e.workflowVersionId ?? null,
                 }));
             },
             async run(workflowId, inputData, options) {
@@ -1146,9 +1187,7 @@ let InstanceAiAdapterService = class InstanceAiAdapterService {
                     ? omitWorkflowConnections(workflow.connections, options.omitConnections)
                     : workflow.connections;
                 const runData = {
-                    executionMode: triggerNode
-                        ? getExecutionModeForTrigger(triggerNode)
-                        : 'manual',
+                    executionMode: triggerNode ? getExecutionModeForTrigger(triggerNode) : 'manual',
                     workflowData: {
                         ...workflow,
                         connections,
@@ -1306,7 +1345,7 @@ let InstanceAiAdapterService = class InstanceAiAdapterService {
                             throw error;
                         }
                     }
-                    const { result, telemetryError } = await extractExecutionOutcome(executionId, allowSendingParameterValues);
+                    const { result, telemetryError } = await extractExecutionOutcome(executionId, allowSendingParameterValues, nodeTypes);
                     await pruneVerificationPins(result.executedNodeNames);
                     trackBuilderExecutedWorkflow(result.status, telemetryError);
                     const workflowPinnedNodeNames = Object.keys(workflow.pinData ?? {});
@@ -1325,14 +1364,14 @@ let InstanceAiAdapterService = class InstanceAiAdapterService {
                 if (isRunning) {
                     return { executionId, status: 'running' };
                 }
-                return await extractExecutionResult(executionId, allowSendingParameterValues);
+                return await extractExecutionResult(executionId, allowSendingParameterValues, nodeTypes);
             },
             async getResult(executionId) {
                 await assertExecutionAccess(executionId);
                 if (activeExecutions.has(executionId)) {
                     await activeExecutions.getPostExecutePromise(executionId);
                 }
-                return await extractExecutionResult(executionId, allowSendingParameterValues);
+                return await extractExecutionResult(executionId, allowSendingParameterValues, nodeTypes);
             },
             async stop(executionId) {
                 assertNotReadOnly();
@@ -1363,12 +1402,12 @@ let InstanceAiAdapterService = class InstanceAiAdapterService {
                 if (!allowSendingParameterValues) {
                     return {
                         nodeName,
-                        items: [],
+                        outputs: [],
                         totalItems: 0,
                         returned: { from: 0, to: 0 },
                     };
                 }
-                return await extractNodeOutput(executionId, nodeName, options);
+                return await extractNodeOutput(executionId, nodeName, options, nodeTypes);
             },
             getResolvedNodeParameters: async (executionId, nodeName, options) => {
                 await assertExecutionAccess(executionId);
@@ -1520,12 +1559,7 @@ let InstanceAiAdapterService = class InstanceAiAdapterService {
             async getDocumentationUrl(credentialType) {
                 try {
                     const credClass = loadNodesAndCredentials.getCredential(credentialType);
-                    const slug = credClass.type.documentationUrl;
-                    if (!slug)
-                        return null;
-                    if (slug.startsWith('http'))
-                        return slug;
-                    return `https://docs.n8n.io/integrations/builtin/credentials/${slug}/`;
+                    return credentialDocsUrl(credClass.type.documentationUrl) ?? null;
                 }
                 catch {
                     return null;
@@ -1582,9 +1616,11 @@ let InstanceAiAdapterService = class InstanceAiAdapterService {
                     if (typeName.toLowerCase().includes(q)) {
                         try {
                             const credClass = loadNodesAndCredentials.getCredential(typeName);
+                            const docsUrl = credentialDocsUrl(credClass.type.documentationUrl);
                             results.push({
                                 type: typeName,
                                 displayName: credClass.type.displayName,
+                                ...(docsUrl ? { documentationUrl: docsUrl } : {}),
                             });
                         }
                         catch {
@@ -1595,9 +1631,11 @@ let InstanceAiAdapterService = class InstanceAiAdapterService {
                     try {
                         const credClass = loadNodesAndCredentials.getCredential(typeName);
                         if (credClass.type.displayName.toLowerCase().includes(q)) {
+                            const docsUrl = credentialDocsUrl(credClass.type.documentationUrl);
                             results.push({
                                 type: typeName,
                                 displayName: credClass.type.displayName,
+                                ...(docsUrl ? { documentationUrl: docsUrl } : {}),
                             });
                         }
                     }
@@ -1889,7 +1927,7 @@ let InstanceAiAdapterService = class InstanceAiAdapterService {
             async updateRows(dataTableId, filter, data, options) {
                 assertNotReadOnly();
                 const { projectId, tableName, resolvedId } = await resolveTableMeta(['dataTable:writeRow'], dataTableId, options);
-                const result = await dataTableService.updateRows(resolvedId, projectId, { filter: filter, data: data }, true);
+                const result = await dataTableService.updateRows(resolvedId, projectId, { filter, data: data }, true);
                 return {
                     updatedCount: Array.isArray(result) ? result.length : 0,
                     dataTableId: resolvedId,
@@ -1900,7 +1938,7 @@ let InstanceAiAdapterService = class InstanceAiAdapterService {
             async deleteRows(dataTableId, filter, options) {
                 assertNotReadOnly();
                 const { projectId, tableName, resolvedId } = await resolveTableMeta(['dataTable:writeRow'], dataTableId, options);
-                const result = await dataTableService.deleteRows(resolvedId, projectId, { filter: filter }, true);
+                const result = await dataTableService.deleteRows(resolvedId, projectId, { filter }, true);
                 return {
                     deletedCount: Array.isArray(result) ? result.length : 0,
                     dataTableId: resolvedId,
@@ -2121,8 +2159,11 @@ let InstanceAiAdapterService = class InstanceAiAdapterService {
                     return result;
                 });
             },
-            async getDescription(nodeType, version) {
-                const [nodes, gatewayConfig] = await Promise.all([getNodes(), getGatewayConfig()]);
+            async getDescription(nodeType, version, options) {
+                const [nodes, gatewayConfig] = await Promise.all([
+                    getNodes(),
+                    options?.includeGatewayMetadata === false ? Promise.resolve(null) : getGatewayConfig(),
+                ]);
                 let desc = version !== undefined
                     ? nodes.find((n) => {
                         if (n.name !== nodeType)
@@ -2465,7 +2506,7 @@ let InstanceAiAdapterService = class InstanceAiAdapterService {
 exports.InstanceAiAdapterService = InstanceAiAdapterService;
 exports.InstanceAiAdapterService = InstanceAiAdapterService = __decorate([
     (0, di_1.Service)(),
-    __metadata("design:paramtypes", [backend_common_1.Logger, config_1.GlobalConfig, workflow_service_1.WorkflowService, workflow_finder_service_1.WorkflowFinderService, db_1.WorkflowRepository, db_1.SharedWorkflowRepository, db_1.ProjectRepository, db_1.ExecutionRepository, credentials_service_1.CredentialsService, credentials_finder_service_1.CredentialsFinderService, active_executions_1.ActiveExecutions, workflow_runner_1.WorkflowRunner, load_nodes_and_credentials_1.LoadNodesAndCredentials, node_types_1.NodeTypes, n8n_core_1.InstanceSettings, data_table_service_1.DataTableService, data_table_repository_1.DataTableRepository, node_resource_explorer_service_1.NodeResourceExplorerService, folder_service_1.FolderService, project_service_ee_1.ProjectService, tag_service_1.TagService, instance_write_access_service_1.InstanceWriteAccessService, instance_ai_settings_service_1.InstanceAiSettingsService, workflow_history_service_1.WorkflowHistoryService, workflow_service_ee_1.EnterpriseWorkflowService, license_1.License, execution_persistence_1.ExecutionPersistence, event_service_1.EventService, role_service_1.RoleService, telemetry_2.Telemetry, db_1.AiBuilderTemporaryWorkflowRepository, backend_network_1.OutboundHttp, ai_gateway_service_1.AiGatewayService, workflow_templates_service_1.WorkflowTemplatesService, collaboration_service_1.CollaborationService, policy_enforcement_service_1.PolicyEnforcementService, node_catalog_1.NodeCatalogService, evaluation_config_service_1.EvaluationConfigService, llm_judge_provider_registry_1.LlmJudgeProviderRegistry, workflow_dependency_query_service_1.WorkflowDependencyQueryService, db_1.FolderRepository, folder_finder_service_1.FolderFinderService])
+    __metadata("design:paramtypes", [backend_common_1.Logger, config_1.GlobalConfig, workflow_service_1.WorkflowService, workflow_finder_service_1.WorkflowFinderService, db_1.WorkflowRepository, db_1.SharedWorkflowRepository, db_1.ProjectRepository, db_1.ExecutionRepository, credentials_service_1.CredentialsService, credentials_finder_service_1.CredentialsFinderService, active_executions_1.ActiveExecutions, workflow_runner_1.WorkflowRunner, load_nodes_and_credentials_1.LoadNodesAndCredentials, node_types_1.NodeTypes, n8n_core_1.InstanceSettings, data_table_service_1.DataTableService, data_table_repository_1.DataTableRepository, node_resource_explorer_service_1.NodeResourceExplorerService, folder_service_1.FolderService, project_service_ee_1.ProjectService, tag_service_1.TagService, instance_write_access_service_1.InstanceWriteAccessService, instance_ai_settings_service_1.InstanceAiSettingsService, workflow_history_service_1.WorkflowHistoryService, workflow_service_ee_1.EnterpriseWorkflowService, license_1.License, execution_persistence_1.ExecutionPersistence, event_service_1.EventService, role_service_1.RoleService, telemetry_2.Telemetry, db_1.AiBuilderTemporaryWorkflowRepository, backend_network_1.OutboundHttp, ai_gateway_service_1.AiGatewayService, workflow_templates_service_1.WorkflowTemplatesService, collaboration_service_1.CollaborationService, policy_enforcement_service_1.PolicyEnforcementService, node_catalog_1.NodeCatalogService, evaluation_config_service_1.EvaluationConfigService, llm_judge_provider_registry_1.LlmJudgeProviderRegistry, workflow_dependency_query_service_1.WorkflowDependencyQueryService, db_1.FolderRepository, folder_finder_service_1.FolderFinderService, instance_context_service_1.InstanceContextService])
 ], InstanceAiAdapterService);
 const MAX_RESULT_CHARS = 20_000;
 const MAX_NODE_OUTPUT_CHARS = 1_000;
@@ -2591,23 +2632,38 @@ function truncateResultData(resultData) {
     if (serialized.length <= MAX_RESULT_CHARS)
         return resultData;
     const truncated = {};
-    for (const [nodeName, items] of Object.entries(resultData)) {
-        if (!Array.isArray(items) || items.length === 0) {
-            truncated[nodeName] = items;
-            continue;
-        }
-        const itemStr = JSON.stringify(items[0]);
-        const preview = itemStr.length > MAX_NODE_OUTPUT_CHARS
-            ? `${itemStr.slice(0, MAX_NODE_OUTPUT_CHARS)}…`
-            : items[0];
-        truncated[nodeName] = {
-            _itemCount: items.length,
-            _truncated: true,
-            _firstItemPreview: preview,
-        };
+    for (const [nodeName, value] of Object.entries(resultData)) {
+        truncated[nodeName] = isBranchedNodeOutput(value)
+            ? {
+                ...value,
+                outputs: value.outputs.map((output) => ({
+                    ...output,
+                    items: collapseItems(output.items),
+                })),
+            }
+            : collapseItems(value);
     }
     return truncated;
 }
+function collapseItems(items) {
+    if (!Array.isArray(items) || items.length === 0)
+        return items;
+    const itemStr = JSON.stringify(items[0]);
+    const preview = itemStr.length > MAX_NODE_OUTPUT_CHARS
+        ? `${itemStr.slice(0, MAX_NODE_OUTPUT_CHARS)}…`
+        : items[0];
+    return {
+        _itemCount: items.length,
+        _truncated: true,
+        _firstItemPreview: preview,
+    };
+}
+function isBranchedNodeOutput(value) {
+    return (typeof value === 'object' &&
+        value !== null &&
+        'outputs' in value &&
+        Array.isArray(value.outputs));
+}
 function wrapResultDataEntries(data) {
     const wrapped = {};
     for (const [nodeName, value] of Object.entries(data)) {
@@ -2651,10 +2707,10 @@ function extractNodeErrors(runData, includeUpstreamDetails, workflowNodes = [])
     }
     return nodeErrors;
 }
-async function extractExecutionResult(executionId, includeOutputData = true) {
-    return (await extractExecutionOutcome(executionId, includeOutputData)).result;
+async function extractExecutionResult(executionId, includeOutputData = true, nodeTypes) {
+    return (await extractExecutionOutcome(executionId, includeOutputData, nodeTypes)).result;
 }
-async function extractExecutionOutcome(executionId, includeOutputData = true) {
+async function extractExecutionOutcome(executionId, includeOutputData = true, nodeTypes) {
     const execution = await di_1.Container.get(execution_persistence_1.ExecutionPersistence).findSingleExecution(executionId, {
         includeData: true,
         unflattenData: true,
@@ -2672,21 +2728,36 @@ async function extractExecutionOutcome(executionId, includeOutputData = true) {
     const resultData = {};
     const runData = execution.data?.resultData?.runData;
     const executedNodeNames = Object.keys(runData ?? {});
-    if (includeOutputData) {
-        if (runData) {
+    if (includeOutputData && runData) {
+        const workflow = buildExecutionWorkflow(execution.workflowData, nodeTypes);
+        await workflow?.expression.acquireIsolate();
+        try {
             for (const [nodeName, nodeRuns] of Object.entries(runData)) {
                 const lastRun = nodeRuns[nodeRuns.length - 1];
-                if (lastRun?.data?.main) {
-                    const outputItems = lastRun.data.main
-                        .flat()
-                        .filter((item) => item !== null && item !== undefined)
-                        .map((item) => item.json);
-                    if (outputItems.length > 0) {
-                        resultData[nodeName] = truncateNodeOutput(outputItems);
-                    }
+                if (!lastRun?.data?.main)
+                    continue;
+                const branches = lastRun.data.main.map((items) => (items ?? []).map((item) => item.json));
+                const totalItems = branches.reduce((sum, items) => sum + items.length, 0);
+                if (totalItems === 0)
+                    continue;
+                if (branches.length === 1) {
+                    resultData[nodeName] = truncateNodeOutput(branches[0]);
+                    continue;
                 }
+                const names = resolveOutputNames(workflow, nodeName);
+                resultData[nodeName] = {
+                    outputs: branches.map((items, index) => ({
+                        index,
+                        ...(names[index] ? { name: names[index] } : {}),
+                        items: truncateNodeOutput(items),
+                    })),
+                    totalItems,
+                };
             }
         }
+        finally {
+            await workflow?.expression.releaseIsolate();
+        }
     }
     const error = execution.data?.resultData?.error;
     const errorMessage = error ? formatExecutionError(error, includeOutputData) : undefined;
@@ -2701,6 +2772,7 @@ async function extractExecutionOutcome(executionId, includeOutputData = true) {
             executedNodeNames: executedNodeNames.length > 0 ? executedNodeNames : undefined,
             nodeErrors: nodeErrors.length > 0 ? nodeErrors : undefined,
             lastNodeExecuted: execution.data?.resultData?.lastNodeExecuted,
+            workflowVersionId: execution.workflowVersionId,
             error: errorMessage,
             startedAt: execution.startedAt?.toISOString(),
             finishedAt: execution.stoppedAt?.toISOString(),
@@ -2754,7 +2826,46 @@ function truncateNodeOutput(items) {
     };
 }
 const MAX_ITEM_CHARS = 50_000;
-async function extractNodeOutput(executionId, nodeName, options) {
+function capItem(item) {
+    const str = JSON.stringify(item);
+    return str.length > MAX_ITEM_CHARS
+        ? { _truncatedItem: true, preview: str.slice(0, MAX_ITEM_CHARS), originalLength: str.length }
+        : item;
+}
+function buildExecutionWorkflow(workflowData, nodeTypes) {
+    if (!workflowData || !nodeTypes)
+        return undefined;
+    try {
+        return new n8n_workflow_1.Workflow({
+            nodes: workflowData.nodes,
+            connections: workflowData.connections,
+            active: false,
+            nodeTypes,
+        });
+    }
+    catch {
+        return undefined;
+    }
+}
+function resolveOutputNames(workflow, nodeName) {
+    const node = workflow?.getNode(nodeName);
+    if (!workflow || !node)
+        return [];
+    try {
+        const { description } = workflow.nodeTypes.getByNameAndVersion(node.type, node.typeVersion);
+        const outputs = n8n_workflow_1.NodeHelpers.getNodeOutputs(workflow, node, description);
+        const count = Math.max(outputs.length, description.outputNames?.length ?? 0);
+        return Array.from({ length: count }, (_, i) => {
+            const output = outputs[i];
+            const displayName = typeof output === 'object' ? output.displayName : undefined;
+            return displayName ?? description.outputNames?.[i] ?? '';
+        });
+    }
+    catch {
+        return [];
+    }
+}
+async function extractNodeOutput(executionId, nodeName, options, nodeTypes) {
     const execution = await di_1.Container.get(execution_persistence_1.ExecutionPersistence).findSingleExecution(executionId, {
         includeData: true,
         unflattenData: true,
@@ -2770,34 +2881,40 @@ async function extractNodeOutput(executionId, nodeName, options) {
     const lastRun = nodeRuns[nodeRuns.length - 1];
     const startIndex = options?.startIndex ?? 0;
     const maxItems = Math.min(options?.maxItems ?? 10, 50);
+    const workflow = buildExecutionWorkflow(execution.workflowData, nodeTypes);
+    await workflow?.expression.acquireIsolate();
+    let names;
+    try {
+        names = resolveOutputNames(workflow, nodeName);
+    }
+    finally {
+        await workflow?.expression.releaseIsolate();
+    }
     let index = 0;
-    let totalItems = 0;
-    const collected = [];
-    for (const output of lastRun?.data?.main ?? []) {
-        for (const item of output ?? []) {
-            totalItems++;
-            if (index >= startIndex && collected.length < maxItems) {
+    let returnedCount = 0;
+    const outputs = (lastRun?.data?.main ?? []).map((output, outputIndex) => {
+        const items = output ?? [];
+        const firstInPage = Math.max(startIndex - index, 0);
+        const collected = [];
+        for (const item of items) {
+            if (index >= startIndex && returnedCount < maxItems) {
                 collected.push(item.json);
+                returnedCount++;
             }
             index++;
         }
-    }
-    const capped = collected.map((item) => {
-        const str = JSON.stringify(item);
-        if (str.length > MAX_ITEM_CHARS) {
-            return {
-                _truncatedItem: true,
-                preview: str.slice(0, MAX_ITEM_CHARS),
-                originalLength: str.length,
-            };
-        }
-        return item;
+        return {
+            index: outputIndex,
+            ...(names[outputIndex] ? { name: names[outputIndex] } : {}),
+            totalItems: items.length,
+            items: collected.map((item, i) => (0, instance_ai_1.wrapUntrustedData)(JSON.stringify(capItem(item), null, 2), 'execution-output', `node:${nodeName}[${outputIndex}][${firstInPage + i}]`)),
+        };
     });
     return {
         nodeName,
-        items: capped.map((item, i) => (0, instance_ai_1.wrapUntrustedData)(JSON.stringify(item, null, 2), 'execution-output', `node:${nodeName}[${startIndex + i}]`)),
-        totalItems,
-        returned: { from: startIndex, to: startIndex + capped.length },
+        outputs,
+        totalItems: index,
+        returned: { from: startIndex, to: startIndex + returnedCount },
     };
 }
 const KNOWN_TRIGGER_TYPES = new Set([
@@ -2872,7 +2989,7 @@ async function extractExecutionDebugInfo(executionId, includeOutputData = true,
             nodeTrace: [],
         };
     }
-    const baseResult = await extractExecutionResult(executionId, includeOutputData);
+    const baseResult = await extractExecutionResult(executionId, includeOutputData, nodeTypes);
     const runData = execution.data?.resultData?.runData;
     const nodeTrace = [];
     let failedNode;
@@ -3039,8 +3156,12 @@ function toWorkflowJSON(workflow, options) {
             notesInFlow: n.notesInFlow,
             executeOnce: n.executeOnce,
             retryOnFail: n.retryOnFail,
+            maxTries: n.maxTries,
+            waitBetweenTries: n.waitBetweenTries,
             alwaysOutputData: n.alwaysOutputData,
-            onError: n.onError,
+            onError: n.onError ?? (n.continueOnFail ? 'continueRegularOutput' : undefined),
+            extendsCredential: n.extendsCredential,
+            customTelemetryTags: n.customTelemetryTags,
         })),
         connections: source.connections,
         settings: workflow.settings,