n8n 2.36.7 → 2.37.1

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

@@ -23,6 +23,7 @@ const db_1 = require("@n8n/db");
 const decorators_1 = require("@n8n/decorators");
 const di_1 = require("@n8n/di");
 const instance_ai_1 = require("@n8n/instance-ai");
+const confirmation_payload_1 = require("@n8n/instance-ai/confirmation-payload");
 const telemetry_1 = require("@n8n/telemetry");
 const lazy_import_1 = require("@n8n/utils/lazy-import");
 const workflow_sdk_1 = require("@n8n/workflow-sdk");
@@ -329,47 +330,6 @@ function classifyUnclaimedResume(error, flags) {
 const MAX_CONCURRENT_BACKGROUND_TASKS_PER_THREAD = 5;
 const MAX_CONSECUTIVE_FAILED_INTERNAL_FOLLOW_UPS = 3;
 const TITLE_REFINE_HISTORY_LIMIT = 50;
-function toConfirmationData(request) {
-    switch (request.kind) {
-        case 'approval':
-            return { approved: request.approved, userInput: request.userInput, scope: request.scope };
-        case 'domainAccessApprove':
-            return { approved: true, domainAccessAction: request.domainAccessAction };
-        case 'domainAccessDeny':
-            return { approved: false };
-        case 'planDeny':
-            return { approved: false, denied: true };
-        case 'questions':
-            return { approved: true, answers: request.answers };
-        case 'credentialSelection':
-            return { approved: true, credentials: request.credentials };
-        case 'credentialAutoSetup':
-            return {
-                approved: true,
-                autoSetup: { credentialType: request.credentialType, attemptId: request.attemptId },
-            };
-        case 'resourceDecision':
-            return { approved: true, resourceDecision: request.resourceDecision };
-        case 'mcpConnect':
-            return { approved: request.approved, connectedSlugs: request.connectedSlugs };
-        case 'setupWorkflowApply':
-            return {
-                approved: true,
-                action: 'apply',
-                nodeCredentials: request.nodeCredentials,
-                nodeParameters: request.nodeParameters,
-                skippedNodes: request.skippedNodes,
-            };
-        case 'setupWorkflowTestTrigger':
-            return {
-                approved: true,
-                action: 'test-trigger',
-                testTriggerNode: request.testTriggerNode,
-                nodeCredentials: request.nodeCredentials,
-                nodeParameters: request.nodeParameters,
-            };
-    }
-}
 let InstanceAiService = class InstanceAiService {
     get mcpClientManager() {
         if (!this._mcpClientManager) {
@@ -462,7 +422,9 @@ let InstanceAiService = class InstanceAiService {
         });
         this.tracing = new tracing_1.InstanceAiTracingService({
             logger: this.logger,
-            eventBus: this.eventBus,
+            eventReader: {
+                getEventsForRun: async (threadId, runId) => await this.readRunEvents(threadId, [runId]),
+            },
             runState: this.runState,
             dbSnapshotStorage: this.dbSnapshotStorage,
             aiService: this.aiService,
@@ -480,12 +442,8 @@ let InstanceAiService = class InstanceAiService {
             durableLog: globalConfig.instanceAi.durableLog,
             eventBus: {
                 publish: (threadId, event) => this.eventBus.publish(threadId, event),
-                getEventsForRun: async (threadId, runId) => this.instanceAiConfig.durableLog
-                    ? await this.readDurableEventsForRuns(threadId, [runId])
-                    : this.eventBus.getEventsForRun(threadId, runId),
-                getEventsForRuns: async (threadId, runIds) => this.instanceAiConfig.durableLog
-                    ? await this.readDurableEventsForRuns(threadId, runIds)
-                    : this.eventBus.getEventsForRuns(threadId, runIds),
+                getEventsForRun: async (threadId, runId) => await this.readRunEvents(threadId, [runId]),
+                getEventsForRuns: async (threadId, runIds) => await this.readRunEvents(threadId, runIds),
             },
             dbSnapshotStorage: this.dbSnapshotStorage,
             agentMemory: this.agentMemory,
@@ -1591,7 +1549,7 @@ let InstanceAiService = class InstanceAiService {
         context.threadId = threadId;
         context.threadMemory = memory;
         context.trackTelemetry = (eventName, properties) => {
-            this.telemetry.track(eventName, properties);
+            this.telemetry.track(eventName, (0, telemetry_1.redactTelemetryProperties)(properties));
         };
         const domainTools = (0, instance_ai_1.createAllTools)(context);
         const orchestrationContext = {
@@ -1607,7 +1565,7 @@ let InstanceAiService = class InstanceAiService {
             logger: this.logger,
             outputRedaction: (0, output_redaction_config_1.resolveOutputRedaction)(this.instanceAiConfig),
             trackTelemetry: (eventName, properties) => {
-                this.telemetry.track(eventName, properties);
+                this.telemetry.track(eventName, (0, telemetry_1.redactTelemetryProperties)(properties));
             },
             claimSubAgentUsage: async (dedupeId, usage, status) => {
                 try {
@@ -2252,6 +2210,7 @@ let InstanceAiService = class InstanceAiService {
                 traceInput.messageGroupId = messageGroupId;
             }
             const proxyRunConfig = await this.createProxyRunConfig(user);
+            const browserExtension = this.browserSessionService.getExtensionTraceContext(user.id);
             if (resumeReason) {
                 tracing = await this.tracing.createOrchestratorResumeTraceContext({
                     threadId,
@@ -2269,6 +2228,7 @@ let InstanceAiService = class InstanceAiService {
                             ? { build_task_id: plannedBuild.buildTaskId }
                             : {}),
                     },
+                    browserExtension,
                 });
             }
             else {
@@ -2282,6 +2242,7 @@ let InstanceAiService = class InstanceAiService {
                     proxyConfig: proxyRunConfig.tracingProxyConfig,
                     n8nVersion: constants_1.N8N_VERSION,
                     workflowSdkVersion: constants_1.WORKFLOW_SDK_VERSION,
+                    browserExtension,
                 });
             }
             if (this.isRunDebugEnabled()) {
@@ -2596,7 +2557,7 @@ let InstanceAiService = class InstanceAiService {
                 if (intermediateText) {
                     this.telemetry.track('Builder sent message', {
                         thread_id: threadId,
-                        message: intermediateText,
+                        message: (0, telemetry_1.redactTelemetryText)(intermediateText),
                         is_intermediate: true,
                     });
                 }
@@ -2701,7 +2662,9 @@ let InstanceAiService = class InstanceAiService {
                 status: finalStatus,
                 outputText,
                 modelId,
-                metadata: this.tracing.buildMessageTraceMetadata(threadId, runId, { status: finalStatus }),
+                metadata: await this.tracing.buildMessageTraceMetadata(threadId, runId, {
+                    status: finalStatus,
+                }),
             };
             const archivedWorkflowIds = await this.temporaryWorkflowService.reapForRun(threadId, user, aiCreatedWorkflowIds, this.backgroundTasks.getRunningTasks(threadId).length);
             await this.finalizeRun(threadId, runId, result.status, snapshotStorage, {
@@ -2726,7 +2689,7 @@ let InstanceAiService = class InstanceAiService {
             if (result.status === 'completed') {
                 this.telemetry.track('Builder sent message', {
                     thread_id: threadId,
-                    message: outputText,
+                    message: (0, telemetry_1.redactTelemetryText)(outputText),
                 });
                 this.telemetry.track('Builder satisfied user intent', {
                     thread_id: threadId,
@@ -2759,7 +2722,7 @@ let InstanceAiService = class InstanceAiService {
                 messageTraceFinalization = {
                     status: 'cancelled',
                     reason: cancellationReason,
-                    metadata: this.tracing.buildMessageTraceMetadata(threadId, runId, {
+                    metadata: await this.tracing.buildMessageTraceMetadata(threadId, runId, {
                         status: 'cancelled',
                         cancellationReason,
                         runTimeout,
@@ -2817,7 +2780,9 @@ let InstanceAiService = class InstanceAiService {
             messageTraceFinalization = {
                 status: 'error',
                 reason: errorMessage,
-                metadata: this.tracing.buildMessageTraceMetadata(threadId, runId, { status: 'error' }),
+                metadata: await this.tracing.buildMessageTraceMetadata(threadId, runId, {
+                    status: 'error',
+                }),
             };
             const archivedWorkflowIds = await this.temporaryWorkflowService.reapForRun(threadId, user, aiCreatedWorkflowIds, this.backgroundTasks.getRunningTasks(threadId).length);
             this.publishRunFinish(threadId, runId, 'errored', userFacingErrorMessage, archivedWorkflowIds, user.id, { errorMessage, errorSource: 'exception' });
@@ -3011,7 +2976,7 @@ let InstanceAiService = class InstanceAiService {
         await this.schedulePlannedTasks(user, threadId);
     }
     async resolveConfirmation(requestingUserId, requestId, request) {
-        const data = toConfirmationData(request);
+        const data = (0, confirmation_payload_1.toConfirmationData)(request);
         const freshUser = await this.revalidateActiveUser(requestingUserId);
         if (!freshUser) {
             this.runState.rejectPendingConfirmation(requestId);
@@ -3252,23 +3217,7 @@ let InstanceAiService = class InstanceAiService {
             return { ok: true, runId };
         }
         void this.suspendedThreads.dropPendingConfirmation(requestId);
-        const credentialsPayload = data.nodeCredentials ?? data.credentials;
-        const resumeData = {
-            approved: data.approved,
-            ...(credentialsPayload ? { credentials: credentialsPayload } : {}),
-            ...(data.userInput !== undefined ? { userInput: data.userInput } : {}),
-            ...(data.domainAccessAction ? { domainAccessAction: data.domainAccessAction } : {}),
-            ...(data.action ? { action: data.action } : {}),
-            ...(data.nodeParameters ? { nodeParameters: data.nodeParameters } : {}),
-            ...(data.skippedNodes ? { skippedNodes: data.skippedNodes } : {}),
-            ...(data.testTriggerNode ? { testTriggerNode: data.testTriggerNode } : {}),
-            ...(data.answers ? { answers: data.answers } : {}),
-            ...(data.resourceDecision ? { resourceDecision: data.resourceDecision } : {}),
-            ...(data.scope ? { scope: data.scope } : {}),
-            ...(data.autoSetup ? { autoSetup: data.autoSetup } : {}),
-            ...(data.denied ? { denied: true } : {}),
-            ...(data.connectedSlugs ? { connectedSlugs: data.connectedSlugs } : {}),
-        };
+        const resumeData = (0, confirmation_payload_1.buildResumeData)(data);
         const resumeTracing = await this.tracing.createOrchestratorResumeTraceContext({
             baseTracing: tracing,
             threadId,
@@ -3299,6 +3248,7 @@ let InstanceAiService = class InstanceAiService {
                     ? { build_task_id: plannedBuild.buildTaskId }
                     : {}),
             },
+            browserExtension: this.browserSessionService.getExtensionTraceContext(activeUser.id),
             register: false,
         });
         const effectiveTracing = resumeTracing ?? tracing;
@@ -3481,7 +3431,7 @@ let InstanceAiService = class InstanceAiService {
                 if (intermediateText) {
                     this.telemetry.track('Builder sent message', {
                         thread_id: opts.threadId,
-                        message: intermediateText,
+                        message: (0, telemetry_1.redactTelemetryText)(intermediateText),
                         is_intermediate: true,
                     });
                 }
@@ -3588,7 +3538,7 @@ let InstanceAiService = class InstanceAiService {
             messageTraceFinalization = {
                 status: finalStatus,
                 outputText,
-                metadata: this.tracing.buildMessageTraceMetadata(opts.threadId, opts.runId, {
+                metadata: await this.tracing.buildMessageTraceMetadata(opts.threadId, opts.runId, {
                     status: finalStatus,
                 }),
             };
@@ -3616,7 +3566,7 @@ let InstanceAiService = class InstanceAiService {
                 completedSetupWorkflowId = this.getWorkflowSetupSuspensionWorkflowId(opts.toolName, opts.suspendPayload);
                 this.telemetry.track('Builder sent message', {
                     thread_id: opts.threadId,
-                    message: outputText,
+                    message: (0, telemetry_1.redactTelemetryText)(outputText),
                 });
                 this.telemetry.track('Builder satisfied user intent', {
                     thread_id: opts.threadId,
@@ -3651,7 +3601,7 @@ let InstanceAiService = class InstanceAiService {
                 messageTraceFinalization = {
                     status: 'cancelled',
                     reason: cancellationReason,
-                    metadata: this.tracing.buildMessageTraceMetadata(opts.threadId, opts.runId, {
+                    metadata: await this.tracing.buildMessageTraceMetadata(opts.threadId, opts.runId, {
                         status: 'cancelled',
                         cancellationReason,
                         runTimeout,
@@ -3709,7 +3659,7 @@ let InstanceAiService = class InstanceAiService {
             messageTraceFinalization = {
                 status: 'error',
                 reason: errorMessage,
-                metadata: this.tracing.buildMessageTraceMetadata(opts.threadId, opts.runId, {
+                metadata: await this.tracing.buildMessageTraceMetadata(opts.threadId, opts.runId, {
                     status: 'error',
                 }),
             };
@@ -4153,7 +4103,7 @@ let InstanceAiService = class InstanceAiService {
         await this.tracing.maybeFinalizeRunTraceRoot(suspended.runId, {
             status: 'cancelled',
             reason,
-            metadata: this.tracing.buildMessageTraceMetadata(suspended.threadId, suspended.runId, {
+            metadata: await this.tracing.buildMessageTraceMetadata(suspended.threadId, suspended.runId, {
                 status: 'cancelled',
                 cancellationReason: reason,
                 ...(runTimeout ? { runTimeout } : {}),
@@ -4189,7 +4139,7 @@ let InstanceAiService = class InstanceAiService {
             this.telemetry.track('Builder generation errored', {
                 thread_id: threadId,
                 run_id: runId,
-                error_message: errorInfo?.errorMessage ?? reason ?? 'unknown',
+                error_message: (0, telemetry_1.redactTelemetryText)(errorInfo?.errorMessage ?? reason ?? 'unknown'),
                 ...(errorInfo?.errorSource ? { error_source: errorInfo.errorSource } : {}),
                 ...(userId ? { user_id: userId } : {}),
             });
@@ -4404,7 +4354,10 @@ let InstanceAiService = class InstanceAiService {
         }
         return '';
     }
-    async readDurableEventsForRuns(threadId, runIds) {
+    async readRunEvents(threadId, runIds) {
+        if (!this.instanceAiConfig.durableLog) {
+            return this.eventBus.getEventsForRuns(threadId, runIds);
+        }
         await this.eventLog.flush(threadId);
         return await this.eventLog.getEventsForRuns(threadId, runIds);
     }
@@ -4419,14 +4372,10 @@ let InstanceAiService = class InstanceAiService {
                     const snapshot = await snapshotStorage.getLatest(threadId, { messageGroupId, runId });
                     groupRunIds = snapshot?.runIds?.length ? snapshot.runIds : [runId];
                 }
-                events = this.instanceAiConfig.durableLog
-                    ? await this.readDurableEventsForRuns(threadId, groupRunIds)
-                    : this.eventBus.getEventsForRuns(threadId, groupRunIds);
+                events = await this.readRunEvents(threadId, groupRunIds);
             }
             else {
-                events = this.instanceAiConfig.durableLog
-                    ? await this.readDurableEventsForRuns(threadId, [runId])
-                    : this.eventBus.getEventsForRun(threadId, runId);
+                events = await this.readRunEvents(threadId, [runId]);
             }
             if (isUpdate && events.length === 0) {
                 this.logger.warn('Skipped updating empty Instance AI agent tree snapshot', {