n8n 2.16.0 → 2.17.0

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

@@ -52,8 +52,10 @@ const url_service_1 = require("../../services/url.service");
 const instance_ai_1 = require("@n8n/instance-ai");
 const workflow_sdk_1 = require("@n8n/workflow-sdk");
 const nanoid_1 = require("nanoid");
+const source_control_preferences_service_ee_1 = require("../../modules/source-control.ee/source-control-preferences.service.ee");
 const ai_service_1 = require("../../services/ai.service");
 const push_1 = require("../../push");
+const telemetry_1 = require("../../telemetry");
 const in_process_event_bus_1 = require("./event-bus/in-process-event-bus");
 const filesystem_1 = require("./filesystem");
 const instance_ai_settings_service_1 = require("./instance-ai-settings.service");
@@ -63,6 +65,7 @@ const typeorm_composite_store_1 = require("./storage/typeorm-composite-store");
 const db_snapshot_storage_1 = require("./storage/db-snapshot-storage");
 const db_iteration_log_storage_1 = require("./storage/db-iteration-log-storage");
 const compaction_service_1 = require("./compaction.service");
+const proxy_token_manager_1 = require("./proxy-token-manager");
 const instance_ai_thread_repository_1 = require("./repositories/instance-ai-thread.repository");
 function getErrorMessage(error) {
     return error instanceof Error ? error.message : String(error);
@@ -73,7 +76,7 @@ function createInertAbortSignal() {
 const ORCHESTRATOR_AGENT_ID = 'agent-001';
 const MAX_CONCURRENT_BACKGROUND_TASKS_PER_THREAD = 5;
 let InstanceAiService = class InstanceAiService {
-    constructor(logger, globalConfig, adapterService, eventBus, settingsService, compositeStore, compactionService, aiService, push, threadRepo, urlService, dbSnapshotStorage, dbIterationLogStorage) {
+    constructor(logger, globalConfig, adapterService, eventBus, settingsService, compositeStore, compactionService, aiService, push, threadRepo, urlService, dbSnapshotStorage, dbIterationLogStorage, sourceControlPreferencesService, telemetry) {
         this.adapterService = adapterService;
         this.eventBus = eventBus;
         this.settingsService = settingsService;
@@ -85,6 +88,8 @@ let InstanceAiService = class InstanceAiService {
         this.urlService = urlService;
         this.dbSnapshotStorage = dbSnapshotStorage;
         this.dbIterationLogStorage = dbIterationLogStorage;
+        this.sourceControlPreferencesService = sourceControlPreferencesService;
+        this.telemetry = telemetry;
         this.mcpClientManager = new instance_ai_1.McpClientManager();
         this.runState = new instance_ai_1.RunStateRegistry();
         this.backgroundTasks = new instance_ai_1.BackgroundTaskManager(MAX_CONCURRENT_BACKGROUND_TASKS_PER_THREAD);
@@ -93,6 +98,7 @@ let InstanceAiService = class InstanceAiService {
         this.gatewayRegistry = new filesystem_1.LocalGatewayRegistry();
         this.domainAccessTrackersByThread = new Map();
         this.threadPushRef = new Map();
+        this.schedulerLocks = new Map();
         this.creditedThreads = new Set();
         this.logger = logger.scoped('instance-ai');
         this.instanceAiConfig = globalConfig.instanceAi;
@@ -203,13 +209,6 @@ let InstanceAiService = class InstanceAiService {
         }
         return new instance_ai_1.BuilderSandboxFactory(config);
     }
-    getLocalFsProvider() {
-        if (!this.localFsProvider) {
-            const basePath = this.instanceAiConfig.filesystemPath || undefined;
-            this.localFsProvider = new filesystem_1.LocalFilesystemProvider(basePath);
-        }
-        return this.localFsProvider;
-    }
     async getOrCreateWorkspace(threadId, user) {
         const existing = this.sandboxes.get(threadId);
         if (existing)
@@ -250,31 +249,22 @@ let InstanceAiService = class InstanceAiService {
             headers: { Authorization: `${token.tokenType} ${token.accessToken}` },
         };
     }
-    async resolveModel(user) {
-        if (this.aiService.isProxyEnabled()) {
-            const { client, headers } = await this.getProxyAuth(user);
-            const modelName = await this.settingsService.resolveModelName(user);
-            const { createAnthropic } = await Promise.resolve().then(() => __importStar(require('@ai-sdk/anthropic')));
-            const provider = createAnthropic({
-                baseURL: client.getApiProxyBaseUrl() + '/anthropic/v1',
-                apiKey: 'proxy-managed',
-                headers,
-            });
-            return provider(modelName);
-        }
-        return await this.settingsService.resolveModelConfig(user);
-    }
-    async resolveSearchProxyConfig(user) {
-        if (!this.aiService.isProxyEnabled())
-            return undefined;
-        const { client, headers } = await this.getProxyAuth(user);
-        return { apiUrl: client.getApiProxyBaseUrl() + '/brave-search', headers };
-    }
-    async resolveTracingProxyConfig(user) {
-        if (!this.aiService.isProxyEnabled())
-            return undefined;
-        const { client, headers } = await this.getProxyAuth(user);
-        return { apiUrl: client.getApiProxyBaseUrl() + '/langsmith', headers };
+    async resolveProxyModel(user, proxyBaseUrl, tokenManager) {
+        const modelName = await this.settingsService.resolveModelName(user);
+        const { createAnthropic } = await Promise.resolve().then(() => __importStar(require('@ai-sdk/anthropic')));
+        const provider = createAnthropic({
+            baseURL: proxyBaseUrl + '/anthropic/v1',
+            apiKey: 'proxy-managed',
+            fetch: async (input, init) => {
+                const headers = new Headers(init?.headers);
+                const auth = await tokenManager.getAuthHeaders();
+                for (const [k, v] of Object.entries(auth)) {
+                    headers.set(k, v);
+                }
+                return await globalThis.fetch(input, { ...init, headers });
+            },
+        });
+        return provider(modelName);
     }
     async countCreditsIfFirst(user, threadId, runId) {
         if (!this.aiService.isProxyEnabled())
@@ -321,14 +311,7 @@ let InstanceAiService = class InstanceAiService {
         return await client.getBuilderInstanceCredits({ id: user.id });
     }
     isEnabled() {
-        return !!this.instanceAiConfig.model;
-    }
-    isLocalFilesystemAvailable() {
-        return !!this.instanceAiConfig.filesystemPath?.trim();
-    }
-    getLocalFilesystemDirectory() {
-        const basePath = this.instanceAiConfig.filesystemPath?.trim();
-        return basePath || null;
+        return this.settingsService.isAgentEnabled() && !!this.instanceAiConfig.model;
     }
     hasActiveRun(threadId) {
         return this.runState.hasLiveRun(threadId);
@@ -374,6 +357,9 @@ let InstanceAiService = class InstanceAiService {
                 error: getErrorMessage(error),
             });
         }
+        finally {
+            (0, instance_ai_1.releaseTraceClient)(tracing.rootRun.traceId);
+        }
     }
     async maybeFinalizeRunTraceRoot(runId, options) {
         const tracing = this.getTraceContext(runId);
@@ -395,6 +381,7 @@ let InstanceAiService = class InstanceAiService {
     deleteTraceContextsForThread(threadId) {
         for (const [runId, entry] of this.traceContextsByRunId) {
             if (entry.threadId === threadId) {
+                (0, instance_ai_1.releaseTraceClient)(entry.tracing.rootRun.traceId);
                 this.traceContextsByRunId.delete(runId);
             }
         }
@@ -422,6 +409,9 @@ let InstanceAiService = class InstanceAiService {
                 error: getErrorMessage(error),
             });
         }
+        finally {
+            (0, instance_ai_1.releaseTraceClient)(traceContext.rootRun.traceId);
+        }
     }
     async finalizeRunTracing(runId, tracing, options) {
         if (!tracing)
@@ -502,6 +492,7 @@ let InstanceAiService = class InstanceAiService {
                 agentId: task.agentId,
                 payload: { role: task.role, result: '', error: 'Cancelled by user' },
             });
+            void this.saveAgentTreeSnapshot(threadId, task.runId, this.dbSnapshotStorage, true, task.messageGroupId);
             if (user) {
                 void this.handlePlannedTaskSettlement(user, task, 'cancelled');
             }
@@ -523,6 +514,7 @@ let InstanceAiService = class InstanceAiService {
                 agentId: ORCHESTRATOR_AGENT_ID,
                 payload: { status: 'cancelled', reason: 'user_cancelled' },
             });
+            void this.saveAgentTreeSnapshot(threadId, suspended.runId, this.dbSnapshotStorage, true);
             if (suspended.mastraRunId) {
                 void this.cleanupMastraSnapshots(suspended.mastraRunId);
             }
@@ -547,6 +539,7 @@ let InstanceAiService = class InstanceAiService {
             agentId: task.agentId,
             payload: { role: task.role, result: '', error: 'Cancelled by user' },
         });
+        void this.saveAgentTreeSnapshot(threadId, task.runId, this.dbSnapshotStorage, true, task.messageGroupId);
         const user = this.runState.getThreadUser(threadId);
         if (user) {
             void this.handlePlannedTaskSettlement(user, task, 'cancelled');
@@ -620,6 +613,7 @@ let InstanceAiService = class InstanceAiService {
             metadata: { completion_source: 'service_cleanup' },
         });
         this.creditedThreads.delete(threadId);
+        this.schedulerLocks.delete(threadId);
         this.domainAccessTrackersByThread.delete(threadId);
         this.threadPushRef.delete(threadId);
         this.deleteTraceContextsForThread(threadId);
@@ -749,20 +743,39 @@ let InstanceAiService = class InstanceAiService {
     async createExecutionEnvironment(user, threadId, runId, abortSignal, researchMode, messageGroupId, pushRef) {
         const localGatewayDisabled = this.settingsService.isLocalGatewayDisabled();
         const userGateway = this.gatewayRegistry.findGateway(user.id);
-        const localFilesystemService = !localGatewayDisabled && !userGateway?.isConnected && this.isLocalFilesystemAvailable()
-            ? this.getLocalFsProvider()
-            : undefined;
-        const searchProxyConfig = await this.resolveSearchProxyConfig(user);
-        const tracingProxyConfig = await this.resolveTracingProxyConfig(user);
+        let searchProxyConfig;
+        let tracingProxyConfig;
+        let tokenManager;
+        let proxyBaseUrl;
+        if (this.aiService.isProxyEnabled()) {
+            const client = await this.aiService.getClient();
+            proxyBaseUrl = client.getApiProxyBaseUrl();
+            const manager = new proxy_token_manager_1.ProxyTokenManager(async () => {
+                return await client.getBuilderApiProxyToken({ id: user.id }, { userMessageId: (0, nanoid_1.nanoid)() });
+            });
+            tokenManager = manager;
+            searchProxyConfig = {
+                apiUrl: proxyBaseUrl + '/brave-search',
+                getAuthHeaders: async () => await manager.getAuthHeaders(),
+            };
+            tracingProxyConfig = {
+                apiUrl: proxyBaseUrl + '/langsmith',
+                getAuthHeaders: async () => await manager.getAuthHeaders(),
+            };
+        }
         const context = this.adapterService.createContext(user, {
-            filesystemService: localFilesystemService,
             searchProxyConfig,
             pushRef,
+            threadId,
         });
         if (!localGatewayDisabled && userGateway?.isConnected) {
             context.localMcpServer = userGateway;
         }
         context.permissions = this.settingsService.getPermissions();
+        if (this.sourceControlPreferencesService.getPreferences().branchReadOnly) {
+            context.permissions = (0, api_types_1.applyBranchReadOnlyOverrides)(context.permissions);
+            context.branchReadOnly = true;
+        }
         let domainTracker = this.domainAccessTrackersByThread.get(threadId);
         if (!domainTracker) {
             domainTracker = (0, instance_ai_1.createDomainAccessTracker)();
@@ -782,7 +795,9 @@ let InstanceAiService = class InstanceAiService {
                 capabilities: ['filesystem', 'browser'],
             };
         }
-        const modelId = await this.resolveModel(user);
+        const modelId = proxyBaseUrl && tokenManager
+            ? await this.resolveProxyModel(user, proxyBaseUrl, tokenManager)
+            : await this.settingsService.resolveModelConfig(user);
         const memory = (0, instance_ai_1.createMemory)(this.createMemoryConfig());
         await this.ensureThreadExists(memory, threadId, user.id);
         const taskStorage = new instance_ai_1.MastraTaskStorage(memory);
@@ -827,6 +842,9 @@ let InstanceAiService = class InstanceAiService {
                         userId: user.id,
                         createdAt: Date.now(),
                     });
+                    queueMicrotask(() => {
+                        void this.saveAgentTreeSnapshot(threadId, runId, snapshotStorage);
+                    });
                 });
             },
             cancelBackgroundTask: async (taskId) => this.cancelBackgroundTask(threadId, taskId),
@@ -841,6 +859,7 @@ let InstanceAiService = class InstanceAiService {
             nodeDefinitionDirs: nodeDefDirs.length > 0 ? nodeDefDirs : undefined,
             domainContext: context,
             tracingProxyConfig,
+            memory,
         };
         return {
             context,
@@ -942,6 +961,10 @@ let InstanceAiService = class InstanceAiService {
         await this.schedulePlannedTasks(user, task.threadId);
     }
     async startInternalFollowUpRun(user, threadId, message, researchMode, messageGroupId) {
+        if (this.runState.hasLiveRun(threadId)) {
+            this.logger.warn('Skipping internal follow-up: active run exists', { threadId });
+            return '';
+        }
         const { runId, abortController } = this.runState.startRun({
             threadId,
             user,
@@ -952,6 +975,12 @@ let InstanceAiService = class InstanceAiService {
         return runId;
     }
     async schedulePlannedTasks(user, threadId) {
+        const prev = this.schedulerLocks.get(threadId) ?? Promise.resolve();
+        const current = prev.then(() => this.doSchedulePlannedTasks(user, threadId)).catch(() => { });
+        this.schedulerLocks.set(threadId, current);
+        await current;
+    }
+    async doSchedulePlannedTasks(user, threadId) {
         const { plannedTaskService } = await this.createPlannedTaskState();
         const graph = await plannedTaskService.getGraph(threadId);
         if (!graph)
@@ -977,7 +1006,7 @@ let InstanceAiService = class InstanceAiService {
         for (const task of action.tasks) {
             await this.dispatchPlannedTask(task, environment.orchestrationContext);
         }
-        await this.schedulePlannedTasks(user, threadId);
+        await this.doSchedulePlannedTasks(user, threadId);
     }
     async executeRun(user, threadId, runId, message, abortController, researchMode, attachments, messageGroupId, timeZone) {
         const signal = abortController.signal;
@@ -1005,6 +1034,10 @@ let InstanceAiService = class InstanceAiService {
             const mcpServers = this.parseMcpServers(this.instanceAiConfig.mcpServers);
             const executionPushRef = this.threadPushRef.get(threadId);
             const { context, memory, taskStorage, snapshotStorage, modelId, orchestrationContext } = await this.createExecutionEnvironment(user, threadId, runId, signal, researchMode, messageGroupId, executionPushRef);
+            orchestrationContext.currentUserMessage = message;
+            if (attachments && attachments.length > 0) {
+                context.currentUserAttachments = attachments;
+            }
             const memoryConfig = this.createMemoryConfig();
             const traceInput = {
                 message,
@@ -1120,31 +1153,54 @@ let InstanceAiService = class InstanceAiService {
             let streamInput;
             try {
                 const enrichedMessage = await this.buildMessageWithRunningTasks(threadId, message);
-                const fullMessage = conversationSummary
+                let fullMessage = conversationSummary
                     ? `${conversationSummary}\n\n${enrichedMessage}`
                     : enrichedMessage;
-                streamInput =
-                    attachments && attachments.length > 0
-                        ? [
+                if (attachments && attachments.length > 0) {
+                    const classified = (0, instance_ai_1.classifyAttachments)(attachments);
+                    const nonStructured = attachments.filter((a) => !(0, instance_ai_1.isStructuredAttachment)(a));
+                    const hasParseable = classified.some((c) => c.parseable);
+                    const manifest = (0, instance_ai_1.buildAttachmentManifest)(classified);
+                    if (!message && hasParseable) {
+                        fullMessage = conversationSummary
+                            ? `${conversationSummary}\n\nThe user attached file(s) without a message. Inspect the first parseable attachment with parse-file and provide a concise summary.\n\n${manifest}`
+                            : `The user attached file(s) without a message. Inspect the first parseable attachment with parse-file and provide a concise summary.\n\n${manifest}`;
+                    }
+                    else {
+                        fullMessage = `${fullMessage}\n\n${manifest}`;
+                    }
+                    if (nonStructured.length > 0) {
+                        streamInput = [
                             {
                                 role: 'user',
                                 content: [
                                     { type: 'text', text: fullMessage },
-                                    ...attachments.map((a) => ({
+                                    ...nonStructured.map((a) => ({
                                         type: 'file',
                                         data: a.data,
                                         mimeType: a.mimeType,
                                     })),
                                 ],
                             },
-                        ]
-                        : fullMessage;
+                        ];
+                    }
+                    else {
+                        streamInput = fullMessage;
+                    }
+                }
+                else {
+                    streamInput = fullMessage;
+                }
                 if (promptBuildRun && tracing) {
-                    await tracing.finishRun(promptBuildRun, {
-                        outputs: {
+                    const traceOutput = typeof streamInput === 'string'
+                        ? { fullMessage: streamInput }
+                        : {
                             fullMessage,
-                            streamInput,
-                        },
+                            attachmentCount: attachments?.length ?? 0,
+                            nonStructuredAttachmentCount: attachments?.filter((a) => !(0, instance_ai_1.isStructuredAttachment)(a)).length ?? 0,
+                        };
+                    await tracing.finishRun(promptBuildRun, {
+                        outputs: traceOutput,
                         metadata: { final_status: 'completed' },
                     });
                 }
@@ -1211,7 +1267,16 @@ let InstanceAiService = class InstanceAiService {
                         tracing,
                     });
                 }
+                const intermediateText = await (result.text ?? Promise.resolve(''));
+                if (intermediateText) {
+                    this.telemetry.track('Builder sent message', {
+                        thread_id: threadId,
+                        message: intermediateText,
+                        is_intermediate: true,
+                    });
+                }
                 if (result.confirmationEvent) {
+                    this.trackConfirmationRequest(threadId, result.confirmationEvent);
                     this.eventBus.publish(threadId, result.confirmationEvent);
                 }
                 await this.saveAgentTreeSnapshot(threadId, runId, snapshotStorage);
@@ -1236,6 +1301,13 @@ let InstanceAiService = class InstanceAiService {
             });
             if (result.status === 'completed') {
                 await this.countCreditsIfFirst(user, threadId, runId);
+                this.telemetry.track('Builder sent message', {
+                    thread_id: threadId,
+                    message: outputText,
+                });
+                this.telemetry.track('Builder satisfied user intent', {
+                    thread_id: threadId,
+                });
             }
         }
         catch (error) {
@@ -1391,9 +1463,19 @@ let InstanceAiService = class InstanceAiService {
                         tracing: opts.tracing,
                     });
                 }
+                const intermediateText = await (result.text ?? Promise.resolve(''));
+                if (intermediateText) {
+                    this.telemetry.track('Builder sent message', {
+                        thread_id: opts.threadId,
+                        message: intermediateText,
+                        is_intermediate: true,
+                    });
+                }
                 if (result.confirmationEvent) {
+                    this.trackConfirmationRequest(opts.threadId, result.confirmationEvent);
                     this.eventBus.publish(opts.threadId, result.confirmationEvent);
                 }
+                await this.saveAgentTreeSnapshot(opts.threadId, opts.runId, opts.snapshotStorage);
                 return;
             }
             const outputText = await (result.text ?? Promise.resolve(''));
@@ -1408,6 +1490,15 @@ let InstanceAiService = class InstanceAiService {
                 metadata: { completion_source: 'orchestrator' },
             };
             await this.finalizeRun(opts.threadId, opts.runId, result.status, opts.snapshotStorage);
+            if (result.status === 'completed') {
+                this.telemetry.track('Builder sent message', {
+                    thread_id: opts.threadId,
+                    message: outputText,
+                });
+                this.telemetry.track('Builder satisfied user intent', {
+                    thread_id: opts.threadId,
+                });
+            }
         }
         catch (error) {
             if (opts.signal.aborted) {
@@ -1546,6 +1637,41 @@ let InstanceAiService = class InstanceAiService {
             formatTask: async (task) => `[Running task — ${task.role}]: taskId=${task.taskId}`,
         });
     }
+    trackConfirmationRequest(threadId, confirmationEvent) {
+        const payload = confirmationEvent.payload;
+        const inputThreadId = (0, nanoid_1.nanoid)();
+        payload.inputThreadId = inputThreadId;
+        const inputType = payload.inputType;
+        let type;
+        if (inputType) {
+            type = inputType;
+        }
+        else if (Array.isArray(payload.setupRequests) && payload.setupRequests.length > 0) {
+            type = 'setup';
+        }
+        else if (Array.isArray(payload.credentialRequests) && payload.credentialRequests.length > 0) {
+            type = 'credential-setup';
+        }
+        else {
+            type = 'approval';
+        }
+        let numSteps = 1;
+        if (Array.isArray(payload.questions)) {
+            numSteps = payload.questions.length;
+        }
+        else if (Array.isArray(payload.setupRequests)) {
+            numSteps = payload.setupRequests.length;
+        }
+        else if (Array.isArray(payload.credentialRequests)) {
+            numSteps = payload.credentialRequests.length;
+        }
+        this.telemetry.track('Builder asked for input', {
+            thread_id: threadId,
+            input_thread_id: inputThreadId,
+            type,
+            num_steps: numSteps,
+        });
+    }
     publishRunFinish(threadId, runId, status, reason) {
         const effectiveStatus = status === 'errored' ? 'error' : status;
         this.eventBus.publish(threadId, {
@@ -1669,6 +1795,8 @@ exports.InstanceAiService = InstanceAiService = __decorate([
         instance_ai_thread_repository_1.InstanceAiThreadRepository,
         url_service_1.UrlService,
         db_snapshot_storage_1.DbSnapshotStorage,
-        db_iteration_log_storage_1.DbIterationLogStorage])
+        db_iteration_log_storage_1.DbIterationLogStorage,
+        source_control_preferences_service_ee_1.SourceControlPreferencesService,
+        telemetry_1.Telemetry])
 ], InstanceAiService);
 //# sourceMappingURL=instance-ai.service.js.map