n8n 2.41.4 → 2.42.1

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

@@ -59,6 +59,7 @@ const execution_persistence_1 = require("../../executions/execution-persistence"
 const license_1 = require("../../license");
 const load_nodes_and_credentials_1 = require("../../load-nodes-and-credentials");
 const agents_credential_provider_1 = require("../../modules/agents/adapters/agents-credential-provider");
+const scoped_credential_provider_1 = require("./eval/scoped-credential-provider");
 const instance_ai_builder_delegate_adapter_1 = require("../../modules/agents/instance-ai-builder-delegate.adapter");
 const data_table_repository_1 = require("../../modules/data-table/data-table.repository");
 const data_table_service_1 = require("../../modules/data-table/data-table.service");
@@ -73,6 +74,8 @@ const check_access_1 = require("../../permissions.ee/check-access");
 const policy_enforcement_service_1 = require("../../policy/policy-enforcement.service");
 const posthog_1 = require("../../posthog");
 const ai_gateway_service_1 = require("../../services/ai-gateway.service");
+const ai_preference_write_1 = require("../../services/ai-preference-write");
+const ai_preference_service_1 = require("../../services/ai-preference.service");
 const folder_finder_service_1 = require("../../services/folder-finder.service");
 const folder_service_1 = require("../../services/folder.service");
 const instance_write_access_service_1 = require("../../services/instance-write-access.service");
@@ -111,6 +114,15 @@ function resolveDisplayedDefaults(nodeProperties, parameters, nodeType, typeVers
     const resolved = n8n_workflow_1.NodeHelpers.getNodeParameters(nodeProperties, parameters, true, false, stubNode, desc);
     return resolved ?? parameters;
 }
+function isToolNode(nodeTypes, node) {
+    try {
+        const { description } = nodeTypes.getByNameAndVersion(node.type, node.typeVersion);
+        return n8n_workflow_1.NodeHelpers.isTool(description, node.parameters);
+    }
+    catch {
+        return false;
+    }
+}
 function credentialDocsUrl(documentationUrl) {
     if (!documentationUrl)
         return undefined;
@@ -177,7 +189,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, instanceContext, executeNodeService) {
+    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, executeNodeService, licenseState, aiPreferenceService) {
         this.globalConfig = globalConfig;
         this.workflowService = workflowService;
         this.workflowFinderService = workflowFinderService;
@@ -221,6 +233,8 @@ let InstanceAiAdapterService = class InstanceAiAdapterService {
         this.folderFinderService = folderFinderService;
         this.instanceContext = instanceContext;
         this.executeNodeService = executeNodeService;
+        this.licenseState = licenseState;
+        this.aiPreferenceService = aiPreferenceService;
         this.nodesCache = null;
         this.NODES_CACHE_TTL_MS = 5 * 60 * 1000;
         this.webResearchCache = new web_research_1.LRUCache({
@@ -238,15 +252,16 @@ let InstanceAiAdapterService = class InstanceAiAdapterService {
         });
     }
     createContext(user, options) {
-        const { searchProxyConfig, pushRef, threadId, projectId, credentialIdAllowlist, shouldBypassCredentialTest, agentId, configEvalsEnabled, setupPanelVariant, mcpConnectionsEnabled, nodeUsageEnabled, instanceContextEnabled, conversationHistory, folderExplorationEnabled, onboardingThread, modelId, } = options ?? {};
+        const { searchProxyConfig, pushRef, threadId, projectId, getCredentialIdAllowlist, shouldBypassCredentialTest, agentId, configEvalsEnabled, setupPanelVariant, mcpConnectionsAvailable, nodeUsageEnabled, instanceContextEnabled, conversationHistory, folderExplorationEnabled, onboardingThread, credentialDescriptionsEnabled, aiPreferencesEnabled, modelId, } = options ?? {};
         void this.trackGatewayAvailability();
         const builderDelegateAdapter = this.getBuilderDelegateAdapter();
-        const credentialService = this.createCredentialAdapter(user, projectId, credentialIdAllowlist, shouldBypassCredentialTest);
+        const credentialService = this.createCredentialAdapter(user, projectId, getCredentialIdAllowlist, shouldBypassCredentialTest);
         return {
             userId: user.id,
             projectId,
             ...(folderExplorationEnabled ? { folderExplorationEnabled: true } : {}),
             ...(onboardingThread ? { onboardingThread: true } : {}),
+            ...(credentialDescriptionsEnabled ? { credentialDescriptionsEnabled: true } : {}),
             modelId,
             workflowService: this.createWorkflowAdapter(user, threadId, projectId, {
                 nodeUsageGateOpen: nodeUsageEnabled === true,
@@ -262,7 +277,7 @@ let InstanceAiAdapterService = class InstanceAiAdapterService {
                     evaluationConfigService: this.createEvaluationConfigAdapter(this.evaluationConfigService, user),
                 }
                 : {}),
-            mcpService: mcpConnectionsEnabled ? this.createMcpAdapter(user) : undefined,
+            mcpService: mcpConnectionsAvailable ? this.createMcpAdapter(user) : undefined,
             executeNodeService: this.executeNodeService
                 ? this.createExecuteNodeAdapter(this.executeNodeService, user, projectId)
                 : undefined,
@@ -270,8 +285,9 @@ let InstanceAiAdapterService = class InstanceAiAdapterService {
             ...(instanceContextEnabled === true && this.instanceContext
                 ? { activityService: this.createActivityAdapter(user, projectId) }
                 : {}),
+            ...(aiPreferencesEnabled ? { aiPreferenceService: this.createPreferenceAdapter(user) } : {}),
             webResearchService: this.createWebResearchAdapter(user, searchProxyConfig),
-            workspaceService: this.createWorkspaceAdapter(user),
+            workspaceService: this.createWorkspaceAdapter(user, projectId),
             templatesService: this.getTemplatesService(),
             workflowTemplateService: this.createWorkflowTemplateAdapter(),
             licenseHints: this.buildLicenseHints(),
@@ -284,11 +300,17 @@ let InstanceAiAdapterService = class InstanceAiAdapterService {
                 : {}),
             ...(builderDelegateAdapter && projectId
                 ? {
-                    builderDelegate: builderDelegateAdapter.createDelegate(user, projectId, (targetAgentId) => new agents_credential_provider_1.AgentsCredentialProvider(this.credentialsService, projectId, user, targetAgentId), credentialService, { useEvalModelCatalog: credentialIdAllowlist !== undefined }),
+                    builderDelegate: builderDelegateAdapter.createDelegate(user, projectId, (targetAgentId) => this.createAgentCredentialProvider(user, projectId, targetAgentId, getCredentialIdAllowlist), credentialService, { useEvalModelCatalog: getCredentialIdAllowlist?.() !== undefined }),
                 }
                 : {}),
         };
     }
+    createAgentCredentialProvider(user, projectId, agentId, getCredentialIdAllowlist) {
+        const provider = new agents_credential_provider_1.AgentsCredentialProvider(this.credentialsService, projectId, user, agentId);
+        return getCredentialIdAllowlist
+            ? (0, scoped_credential_provider_1.scopeCredentialProvider)(provider, getCredentialIdAllowlist)
+            : provider;
+    }
     getBuilderDelegateAdapter() {
         if (!di_1.Container.get(backend_common_1.ModuleRegistry).isActive('agents'))
             return null;
@@ -328,28 +350,25 @@ let InstanceAiAdapterService = class InstanceAiAdapterService {
         }
         const setupPanelVariant = flags[api_types_1.INSTANCE_AI_SETUP_PANEL_FLAG];
         return {
+            credentialDescriptionsEnabled: flags[api_types_1.CREDENTIAL_DESCRIPTIONS_FLAG] === true,
             configEvalsEnabled: flags[api_types_1.CONFIG_EVALUATIONS_FLAG] === api_types_1.CONFIG_EVALUATIONS_ENABLED_VARIANT,
-            mcpConnectionsEnabled: this.mcpPreconditionsHold() &&
-                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,
+            conciseStyleEnabled: flags[api_types_1.INSTANCE_AI_CONCISE_STYLE_FLAG] === api_types_1.INSTANCE_AI_CONCISE_STYLE_ENABLED_VARIANT,
             setupPanelEnabled: setupPanelVariant === api_types_1.INSTANCE_AI_SETUP_PANEL_ENABLED_VARIANT,
             ...(setupPanelVariant === 'control' || setupPanelVariant === 'variant'
                 ? { setupPanelVariant }
                 : {}),
             nodeUsageEnabled: flags[api_types_1.INSTANCE_AI_NODE_USAGE_FLAG] === true,
+            nodeContextEnabled: flags[api_types_1.CANVAS_NODE_CONTEXT_FLAG] === true || flags[api_types_1.AI_ASSISTANT_AT_MENTIONS_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,
             instanceContextEnabled,
         };
     }
-    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)
@@ -370,6 +389,36 @@ let InstanceAiAdapterService = class InstanceAiAdapterService {
             expand: async (id) => await instanceContext.expand({ id, user, scope }),
         };
     }
+    createPreferenceAdapter(user) {
+        const aiPreferenceService = this.aiPreferenceService;
+        if (!aiPreferenceService)
+            throw new n8n_workflow_1.UnexpectedError('AI preference service is not available');
+        return {
+            create: async ({ content, scope }) => {
+                const result = await (0, ai_preference_write_1.writeAssistantPreference)({
+                    aiPreferenceService,
+                    telemetry: this.telemetry,
+                    logger: this.logger,
+                    user,
+                    surface: 'aia',
+                    content,
+                    scope,
+                });
+                if (!result.ok)
+                    return result;
+                const { id, content: saved, userId, projectId } = result.preference;
+                return { ok: true, preference: { id, content: saved, scope, userId, projectId } };
+            },
+            recordRejection: (reason, textLength, scope) => {
+                this.telemetry.track(telemetry_1.TELEMETRY_EVENT.CONTEXT.PREFERENCE_WRITE_REJECTED, {
+                    surface: 'aia',
+                    reason,
+                    scope_type: scope,
+                    text_length: textLength,
+                });
+            },
+        };
+    }
     createMcpAdapter(user) {
         const toSummaries = (servers) => servers
             .filter((server) => !server.isTemplated)
@@ -470,6 +519,9 @@ let InstanceAiAdapterService = class InstanceAiAdapterService {
             },
         };
     }
+    teamProjectsLicensed() {
+        return this.licenseState?.isTeamProjectsLicensed() ?? true;
+    }
     buildLicenseHints() {
         const hints = [];
         if (!this.license.isLicensed('feat:namedVersions')) {
@@ -478,6 +530,9 @@ let InstanceAiAdapterService = class InstanceAiAdapterService {
         if (!this.license.isLicensed('feat:folders')) {
             hints.push('**Folders** — organizing workflows into folders (list-folders, create-folder, delete-folder, move-workflow-to-folder) is available on registered Community Edition or paid plans.');
         }
+        if (!this.teamProjectsLicensed()) {
+            hints.push('**Team projects** — this instance has no team-project license. `list-projects` returns only the user personal project and the project of this conversation, even when the instance holds more. Do not offer to create or move resources into another project. Team projects need a plan upgrade.');
+        }
         return hints;
     }
     async trackGatewayAvailability() {
@@ -1406,7 +1461,7 @@ let InstanceAiAdapterService = class InstanceAiAdapterService {
                         includeData: true,
                         unflattenData: true,
                     });
-                    priorRunData = stored?.data?.resultData?.runData;
+                    priorRunData = stored?.data?.resultData?.runData ?? {};
                     reusedFromExecutionId = options.reuseExecutionId;
                 }
                 const plan = (0, instance_ai_step_run_1.planStepRun)({
@@ -1415,7 +1470,59 @@ let InstanceAiAdapterService = class InstanceAiAdapterService {
                     targetName: nodeName,
                     mockItems: options?.mockInput ? (0, instance_ai_step_run_1.toExecutionItems)(options.mockInput) : undefined,
                     priorRunData,
+                    pinnedNodeNames: Object.keys(workflow.pinData ?? {}),
                 });
+                if (plan.unhonoredInput) {
+                    const names = plan.unhonoredInput.upstreamNodeNames;
+                    const upstream = names.slice(0, 10).join(', ') + (names.length > 10 ? ', …' : '');
+                    if (plan.unhonoredInput.requested === 'mocked') {
+                        throw new n8n_workflow_1.UserError(`mockInput cannot keep every node above "${nodeName}" out of the run: ` +
+                            `the mock leaves a Loop Over Items node unfinished, and n8n would restart it and execute these nodes for real (${upstream}). ` +
+                            'Pass reuseExecutionId with an execution where the loop finished, or omit both options to run the chain on purpose.');
+                    }
+                    throw new n8n_workflow_1.UserError(`Execution ${options?.reuseExecutionId} does not cover every node above "${nodeName}", ` +
+                        `so the run would execute them for real (${upstream}). ` +
+                        'Pick an execution where those nodes ran to completion, or omit both options to run the chain on purpose.');
+                }
+                let agentRequest;
+                if (plan.rootNodeNames) {
+                    const roots = plan.rootNodeNames.map((name) => `"${name}"`).join(' or ');
+                    if (!isToolNode(nodeTypes, target)) {
+                        throw new n8n_workflow_1.UserError(`Node "${nodeName}" cannot run on its own — n8n runs it as part of ${roots}. ` +
+                            `Run ${roots} instead: its execution records what this node returned on every ` +
+                            'call it made.');
+                    }
+                    if ((0, instance_ai_step_run_1.isToolkitNode)(target)) {
+                        throw new n8n_workflow_1.UserError(`Node "${nodeName}" holds several tools, and a step run cannot pick one of them. ` +
+                            `Run ${roots} instead, then read this node with ` +
+                            'executions(action="get-node-output") on that execution: it holds what every ' +
+                            'tool call returned.');
+                    }
+                    const upperRoots = (0, instance_ai_step_run_1.findRootsAboveOtherRoots)(nodes, connections, plan.rootNodeNames);
+                    if (upperRoots.length > 0) {
+                        const upper = upperRoots.map((name) => `"${name}"`).join(' or ');
+                        throw new n8n_workflow_1.UserError(`Node "${nodeName}" runs through ${roots}, and ${upper} runs above another of them, ` +
+                            `so a step run would run ${upper} and the nodes after it again. ` +
+                            `Run ${upper} instead, then read this node with ` +
+                            'executions(action="get-node-output") on that execution: it holds what every ' +
+                            'tool call returned.');
+                    }
+                    const expected = (0, instance_ai_step_run_1.declaredToolArguments)(target);
+                    if (expected.length > 0 && options?.toolArguments === undefined) {
+                        throw new n8n_workflow_1.UserError(`Node "${nodeName}" takes its arguments from the agent, so a step run has to supply them. ` +
+                            `Pass toolArguments with: ${expected.join(', ')}.`);
+                    }
+                    agentRequest = (0, instance_ai_step_run_1.buildToolAgentRequest)({ target, toolArguments: options?.toolArguments });
+                }
+                else if (isToolNode(nodeTypes, target)) {
+                    throw new n8n_workflow_1.UserError(`Node "${nodeName}" is a tool, and no node is connected to run it. ` +
+                        'A tool runs only through the node that owns it, so connect it to an Agent ' +
+                        'and run the step again.');
+                }
+                else if (options?.toolArguments !== undefined) {
+                    throw new n8n_workflow_1.UserError(`toolArguments applies only to a tool node. "${nodeName}" runs in the main graph, ` +
+                        'so its input comes from mockInput, reuseExecutionId, or the nodes above it.');
+                }
                 const stepPinData = (0, instance_ai_step_run_1.pinDataForStepRun)(workflow.pinData, {
                     targetName: nodeName,
                     mockedNodeNames: plan.mockedNodeNames,
@@ -1441,6 +1548,7 @@ let InstanceAiAdapterService = class InstanceAiAdapterService {
                     pinData: stepPinData,
                     runData: plan.runData,
                     dirtyNodeNames: plan.dirtyNodeNames,
+                    agentRequest,
                     source: 'instance_ai',
                 };
                 if ((0, n8n_workflow_1.isTriggerNodeType)(target.type)) {
@@ -1456,6 +1564,7 @@ let InstanceAiAdapterService = class InstanceAiAdapterService {
                             userId: user.id,
                             dirtyNodeNames: plan.dirtyNodeNames,
                             triggerToStartFrom: runData.triggerToStartFrom,
+                            agentRequest,
                             source: 'instance_ai',
                         },
                         executionData: null,
@@ -1493,6 +1602,7 @@ let InstanceAiAdapterService = class InstanceAiAdapterService {
                         nodeName,
                         inputMode: plan.inputMode,
                         mockedNodeNames: plan.mockedNodeNames,
+                        ...(plan.rootNodeNames ? { ranThroughNodeNames: plan.rootNodeNames } : {}),
                         ...(replayedNodeNames.length > 0 ? { replayedNodeNames } : {}),
                         ...(reusedFromExecutionId ? { reusedFromExecutionId } : {}),
                         ...(Object.keys(stepPinData ?? {}).length > 0
@@ -1516,7 +1626,7 @@ let InstanceAiAdapterService = class InstanceAiAdapterService {
                             error: waitOutcome.message,
                         });
                     }
-                    const { result, telemetryError } = await extractExecutionOutcome(executionId, allowSendingParameterValues, nodeTypes);
+                    const { result, telemetryError } = await extractExecutionOutcome(executionId, allowSendingParameterValues, nodeTypes, plan.rootNodeNames ? nodeName : undefined);
                     trackStepRun(result.status, telemetryError);
                     return describe(result);
                 }
@@ -1594,7 +1704,7 @@ let InstanceAiAdapterService = class InstanceAiAdapterService {
             },
         };
     }
-    createCredentialAdapter(user, boundProjectId, credentialIdAllowlist, shouldBypassCredentialTest) {
+    createCredentialAdapter(user, boundProjectId, getCredentialIdAllowlist, shouldBypassCredentialTest) {
         const { credentialsService, credentialsFinderService, loadNodesAndCredentials, aiGatewayService, } = this;
         const getGatewayConfig = async () => await this.getGatewayConfigOrNull();
         const adapter = {
@@ -1608,7 +1718,7 @@ let InstanceAiAdapterService = class InstanceAiAdapterService {
                         id: c.id,
                         name: c.name,
                         type: c.type,
-                        description: c.description,
+                        ...(c.description !== undefined && { description: c.description }),
                     }));
                 }
                 if (options?.workflowId || options?.projectId) {
@@ -1624,7 +1734,7 @@ let InstanceAiAdapterService = class InstanceAiAdapterService {
                         id: c.id,
                         name: c.name,
                         type: c.type,
-                        description: c.description,
+                        ...(c.description !== undefined && { description: c.description }),
                     }));
                 }
                 const credentials = await credentialsService.getMany(user, {
@@ -1637,7 +1747,7 @@ let InstanceAiAdapterService = class InstanceAiAdapterService {
                     id: c.id,
                     name: c.name,
                     type: c.type,
-                    description: c.description,
+                    ...(c.description !== undefined && { description: c.description }),
                 }));
             },
             async get(credentialId) {
@@ -1646,7 +1756,7 @@ let InstanceAiAdapterService = class InstanceAiAdapterService {
                     id: credential.id,
                     name: credential.name,
                     type: credential.type,
-                    description: credential.description,
+                    ...(credential.description !== undefined && { description: credential.description }),
                 };
             },
             async delete(credentialId) {
@@ -1911,12 +2021,16 @@ let InstanceAiAdapterService = class InstanceAiAdapterService {
                 }
             },
         };
-        if (!credentialIdAllowlist)
+        if (!getCredentialIdAllowlist?.())
             return adapter;
-        const allowed = new Set(credentialIdAllowlist);
         return {
             ...adapter,
-            list: async (options) => allowed.size === 0 ? [] : (await adapter.list(options)).filter((c) => allowed.has(c.id)),
+            list: async (options) => {
+                const allowed = new Set(getCredentialIdAllowlist());
+                return allowed.size === 0
+                    ? []
+                    : (await adapter.list(options)).filter((c) => allowed.has(c.id));
+            },
         };
     }
     createEvaluationConfigAdapter(evaluationConfigService, user) {
@@ -2527,10 +2641,11 @@ let InstanceAiAdapterService = class InstanceAiAdapterService {
             findUnavailableLocatorValues: async (params) => await this.nodeResourceExplorerService.findUnavailableResourceLocatorValues(user, params),
         };
     }
-    createWorkspaceAdapter(user) {
+    createWorkspaceAdapter(user, boundProjectId) {
         const { projectService, folderService, tagService, workflowFinderService, workflowService, executionRepository, executionPersistence, eventService, } = this;
         const assertNotReadOnly = (resource) => this.assertInstanceNotReadOnly(resource);
         const { assertProjectScope } = this.createProjectScopeHelpers(user);
+        const teamProjectsLicensed = this.teamProjectsLicensed();
         const adapter = {
             async getProject(projectId) {
                 const project = await projectService.getProjectWithScope(user, projectId, ['project:read']);
@@ -2540,11 +2655,15 @@ let InstanceAiAdapterService = class InstanceAiAdapterService {
             },
             async listProjects() {
                 const projects = await projectService.getAccessibleProjects(user);
-                return projects.map((p) => ({
+                const summaries = projects.map((p) => ({
                     id: p.id,
                     name: p.name,
                     type: p.type,
                 }));
+                if (teamProjectsLicensed)
+                    return summaries;
+                const personalProjectId = (await projectService.getPersonalProject(user))?.id;
+                return summaries.filter((p) => p.id === personalProjectId || p.id === boundProjectId);
             },
             ...(this.license.isLicensed('feat:folders')
                 ? {
@@ -2682,7 +2801,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, instance_context_service_1.InstanceContextService, node_execution_1.ExecuteNodeService])
+    __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, node_execution_1.ExecuteNodeService, backend_common_1.LicenseState, ai_preference_service_1.AiPreferenceService])
 ], InstanceAiAdapterService);
 const MAX_RESULT_CHARS = 20_000;
 const MAX_NODE_OUTPUT_CHARS = 1_000;
@@ -2886,7 +3005,27 @@ function extractNodeErrors(runData, includeUpstreamDetails, workflowNodes = [])
 async function extractExecutionResult(executionId, includeOutputData = true, nodeTypes) {
     return (await extractExecutionOutcome(executionId, includeOutputData, nodeTypes)).result;
 }
-async function extractExecutionOutcome(executionId, includeOutputData = true, nodeTypes) {
+function nonMainOutputs(run) {
+    return Object.entries(run?.data ?? {}).find(([type]) => type !== n8n_workflow_1.NodeConnectionTypes.Main)?.[1];
+}
+const isToolExecutor = (nodeName) => nodeName === constants_1.TOOL_EXECUTOR_NODE_NAME;
+function renameToolExecutor(nodeName, subNodeTarget) {
+    return subNodeTarget && isToolExecutor(nodeName) ? subNodeTarget : nodeName;
+}
+function foldToolExecutorRun(runData, subNodeTarget) {
+    if (!runData || !subNodeTarget || !runData[constants_1.TOOL_EXECUTOR_NODE_NAME])
+        return runData;
+    const folded = {};
+    for (const [nodeName, nodeRuns] of Object.entries(runData)) {
+        if (isToolExecutor(nodeName)) {
+            folded[subNodeTarget] ??= nodeRuns;
+            continue;
+        }
+        folded[nodeName] = nodeRuns;
+    }
+    return folded;
+}
+async function extractExecutionOutcome(executionId, includeOutputData = true, nodeTypes, subNodeTarget) {
     const execution = await di_1.Container.get(execution_persistence_1.ExecutionPersistence).findSingleExecution(executionId, {
         includeData: true,
         unflattenData: true,
@@ -2902,7 +3041,7 @@ async function extractExecutionOutcome(executionId, includeOutputData = true, no
                 ? 'waiting'
                 : 'success';
     const resultData = {};
-    const runData = execution.data?.resultData?.runData;
+    const runData = foldToolExecutorRun(execution.data?.resultData?.runData, subNodeTarget);
     const executedNodeNames = Object.keys(runData ?? {});
     if (includeOutputData && runData) {
         const workflow = buildExecutionWorkflow(execution.workflowData, nodeTypes);
@@ -2910,9 +3049,11 @@ async function extractExecutionOutcome(executionId, includeOutputData = true, no
         try {
             for (const [nodeName, nodeRuns] of Object.entries(runData)) {
                 const lastRun = nodeRuns[nodeRuns.length - 1];
-                if (!lastRun?.data?.main)
+                const outputs = lastRun?.data?.[n8n_workflow_1.NodeConnectionTypes.Main] ??
+                    (nodeName === subNodeTarget ? nonMainOutputs(lastRun) : undefined);
+                if (!outputs)
                     continue;
-                const branches = lastRun.data.main.map((items) => (items ?? []).map((item) => item.json));
+                const branches = outputs.map((items) => (items ?? []).map((item) => item.json));
                 const totalItems = branches.reduce((sum, items) => sum + items.length, 0);
                 if (totalItems === 0)
                     continue;
@@ -2947,7 +3088,7 @@ async function extractExecutionOutcome(executionId, includeOutputData = true, no
                 : undefined,
             executedNodeNames: executedNodeNames.length > 0 ? executedNodeNames : undefined,
             nodeErrors: nodeErrors.length > 0 ? nodeErrors : undefined,
-            lastNodeExecuted: execution.data?.resultData?.lastNodeExecuted,
+            lastNodeExecuted: renameToolExecutor(execution.data?.resultData?.lastNodeExecuted, subNodeTarget),
             workflowVersionId: execution.workflowVersionId,
             error: errorMessage,
             startedAt: execution.startedAt?.toISOString(),
@@ -3119,31 +3260,40 @@ async function extractNodeOutput(executionId, nodeName, options, nodeTypes) {
     finally {
         await workflow?.expression.releaseIsolate();
     }
+    const readsEveryRun = nodeRuns.some((run) => nonMainOutputs(run) !== undefined);
+    const runsRead = readsEveryRun ? nodeRuns : [lastRun];
+    const outputsPerRun = runsRead.map((run) => run?.data?.[n8n_workflow_1.NodeConnectionTypes.Main] ?? nonMainOutputs(run) ?? []);
+    const outputCount = Math.max(0, ...outputsPerRun.map((runOutputs) => runOutputs.length));
     let index = 0;
     let returnedCount = 0;
-    const outputs = (lastRun?.data?.main ?? []).map((output, outputIndex) => {
-        const items = output ?? [];
-        const firstInPage = Math.max(startIndex - index, 0);
+    const outputs = [];
+    for (let outputIndex = 0; outputIndex < outputCount; outputIndex++) {
         const collected = [];
-        for (const item of items) {
-            if (index >= startIndex && returnedCount < maxItems) {
-                collected.push(item.json);
-                returnedCount++;
+        let itemsOnOutput = 0;
+        outputsPerRun.forEach((runOutputs, runIndex) => {
+            for (const item of runOutputs[outputIndex] ?? []) {
+                if (index >= startIndex && returnedCount < maxItems) {
+                    const call = runsRead.length > 1 ? `[call ${runIndex + 1}]` : '';
+                    collected.push((0, instance_ai_1.wrapUntrustedData)(JSON.stringify(capItem(item.json), null, 2), 'execution-output', `node:${nodeName}${call}[${outputIndex}][${itemsOnOutput}]`));
+                    returnedCount++;
+                }
+                index++;
+                itemsOnOutput++;
             }
-            index++;
-        }
-        return {
+        });
+        outputs.push({
             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}]`)),
-        };
-    });
+            totalItems: itemsOnOutput,
+            items: collected,
+        });
+    }
     return {
         nodeName,
         outputs,
         totalItems: index,
         returned: { from: startIndex, to: startIndex + returnedCount },
+        ...(nodeRuns.length > 1 ? { totalRuns: nodeRuns.length } : {}),
     };
 }
 const KNOWN_TRIGGER_TYPES = new Set([