n8n 2.32.5 → 2.33.0

package/dist/modules/instance-ai/repositories/instance-ai-event-log.repository.d.ts

@@ -19,6 +19,6 @@ export declare class InstanceAiEventLogRepository extends Repository<InstanceAiE
         event: InstanceAiEvent;
     }>>;
     lastFactAt(threadId: string, runId: string): Promise<Date | null>;
-    findUnfinishedRuns(): Promise<UnfinishedRun[]>;
+    findUnfinishedRuns(threadId?: string): Promise<UnfinishedRun[]>;
     private toEvent;
 }

package/dist/modules/instance-ai/repositories/instance-ai-event-log.repository.js

@@ -80,8 +80,8 @@ let InstanceAiEventLogRepository = class InstanceAiEventLogRepository extends ty
             return null;
         return row.max instanceof Date ? row.max : new Date(row.max);
     }
-    async findUnfinishedRuns() {
-        const rows = await this.createQueryBuilder('e')
+    async findUnfinishedRuns(threadId) {
+        const qb = this.createQueryBuilder('e')
             .select('e.threadId', 'threadId')
             .addSelect('e.runId', 'runId')
             .distinct(true)
@@ -94,9 +94,10 @@ let InstanceAiEventLogRepository = class InstanceAiEventLogRepository extends ty
                 .where('f.threadId = e.threadId')
                 .andWhere('f.runId = e.runId')
                 .andWhere("f.type = 'run-finish'")
-                .getQuery())
-            .getRawMany();
-        return rows;
+                .getQuery());
+        if (threadId)
+            qb.andWhere('e.threadId = :threadId', { threadId });
+        return await qb.getRawMany();
     }
     toEvent(row) {
         const event = (0, n8n_workflow_1.jsonParse)(row.payload);

package/dist/modules/instance-ai/repositories/instance-ai-event-log.repository.js.map

@@ -1 +1 @@
-{"version":3,"file":"instance-ai-event-log.repository.js","sourceRoot":"","sources":["../../../../src/modules/instance-ai/repositories/instance-ai-event-log.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,gCAAkC;AAElC,0CAAgE;AAChE,+CAAyC;AAEzC,uGAAyF;AASlF,IAAM,4BAA4B,GAAlC,MAAM,4BAA6B,SAAQ,oBAAmC;IACpF,YAAY,UAAsB;QACjC,KAAK,CAAC,4DAAuB,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC;IACpD,CAAC;IAGD,KAAK,CAAC,MAAM,CAAC,QAAgB;QAC5B,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC;aAC5C,MAAM,CAAC,YAAY,EAAE,KAAK,CAAC;aAC3B,KAAK,CAAC,wBAAwB,EAAE,EAAE,QAAQ,EAAE,CAAC;aAC7C,SAAS,EAA0B,CAAC;QACtC,OAAO,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;IACtB,CAAC;IAWD,KAAK,CAAC,WAAW,CAChB,QAAgB,EAChB,QAAgB,EAChB,MAAyB;QAEzB,IAAI,KAAK,GAAG,CAAC,CAAC;QACd,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE;YACpC,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;YACtC,KAAK,IAAI,MAAM,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YAC5C,OAAO;gBACN,QAAQ;gBACR,GAAG,EAAE,QAAQ,GAAG,CAAC;gBACjB,KAAK,EAAE,KAAK,CAAC,KAAK;gBAClB,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,OAAO;aACP,CAAC;QACH,CAAC,CAAC,CAAC;QACH,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACxB,OAAO,KAAK,CAAC;IACd,CAAC;IAMD,KAAK,CAAC,SAAS,CAAC,QAAgB,EAAE,GAAW;QAC5C,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,QAAQ,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;QAC7D,OAAO,GAAG,EAAE,OAAO,IAAI,IAAI,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,QAAgB,EAAE,QAAgB;QAChD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC;YAC5B,KAAK,EAAE,EAAE,QAAQ,EAAE,GAAG,EAAE,IAAA,kBAAQ,EAAC,QAAQ,CAAC,EAAE;YAC5C,KAAK,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE;SACrB,CAAC,CAAC;QACH,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IACjE,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,QAAgB,EAAE,MAAgB;QAClD,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,EAAE,CAAC;QACnC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC;aAC7C,KAAK,CAAC,wBAAwB,EAAE,EAAE,QAAQ,EAAE,CAAC;aAC7C,QAAQ,CAAC,yBAAyB,EAAE,EAAE,MAAM,EAAE,CAAC;aAC/C,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC;aACvB,OAAO,EAAE,CAAC;QACZ,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;IACzC,CAAC;IAID,KAAK,CAAC,YAAY,CACjB,QAAgB;QAEhB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,EAAE,QAAQ,EAAE,EAAE,KAAK,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;QAC7E,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YACvB,KAAK,EAAE,CAAC,CAAC,KAAK;YACd,SAAS,EAAE,CAAC,CAAC,SAAS;YACtB,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;SACtB,CAAC,CAAC,CAAC;IACL,CAAC;IAGD,KAAK,CAAC,UAAU,CAAC,QAAgB,EAAE,KAAa;QAC/C,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC;aAC5C,MAAM,CAAC,kBAAkB,EAAE,KAAK,CAAC;aACjC,KAAK,CAAC,wBAAwB,EAAE,EAAE,QAAQ,EAAE,CAAC;aAC7C,QAAQ,CAAC,kBAAkB,EAAE,EAAE,KAAK,EAAE,CAAC;aACvC,SAAS,EAAiC,CAAC;QAC7C,IAAI,CAAC,GAAG,EAAE,GAAG;YAAE,OAAO,IAAI,CAAC;QAC3B,OAAO,GAAG,CAAC,GAAG,YAAY,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAC9D,CAAC;IAOD,KAAK,CAAC,kBAAkB;QACvB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC;aAC7C,MAAM,CAAC,YAAY,EAAE,UAAU,CAAC;aAChC,SAAS,CAAC,SAAS,EAAE,OAAO,CAAC;aAC7B,QAAQ,CAAC,IAAI,CAAC;aACd,KAAK,CAAC,sBAAsB,CAAC;aAC7B,QAAQ,CACR,CAAC,EAAE,EAAE,EAAE,CACN,aAAa;YACb,EAAE;iBACA,QAAQ,EAAE;iBACV,MAAM,CAAC,GAAG,CAAC;iBACX,IAAI,CAAC,4DAAuB,EAAE,GAAG,CAAC;iBAClC,KAAK,CAAC,yBAAyB,CAAC;iBAChC,QAAQ,CAAC,mBAAmB,CAAC;iBAC7B,QAAQ,CAAC,uBAAuB,CAAC;iBACjC,QAAQ,EAAE,CACb;aACA,UAAU,EAAiB,CAAC;QAC9B,OAAO,IAAI,CAAC;IACb,CAAC;IAMO,OAAO,CAAC,GAA4B;QAC3C,MAAM,KAAK,GAAG,IAAA,wBAAS,EAAkB,GAAG,CAAC,OAAO,CAAC,CAAC;QACtD,KAAK,CAAC,EAAE,KAAK,GAAG,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;QACrC,OAAO,KAAK,CAAC;IACd,CAAC;CACD,CAAA;;uCAnIY,4BAA4B;IADxC,IAAA,YAAO,GAAE;qCAEe,oBAAU;GADtB,4BAA4B,CAmIxC"}
+{"version":3,"file":"instance-ai-event-log.repository.js","sourceRoot":"","sources":["../../../../src/modules/instance-ai/repositories/instance-ai-event-log.repository.ts"],"names":[],"mappings":"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"}

package/dist/modules/instance-ai/sandbox/instance-ai-sandbox.service.d.ts

@@ -5,6 +5,7 @@ import type { ErrorReporter } from 'n8n-core';
 export type RuntimeSandboxEntry = {
     sandbox: NonNullable<Awaited<ReturnType<typeof createSandbox>>>;
     workspace: NonNullable<ReturnType<typeof createWorkspace>>;
+    configFingerprint: string;
     setupComplete: boolean;
     setupPromise: Promise<void> | undefined;
     expiresAt: number;
@@ -18,11 +19,11 @@ export type InstanceAiSandboxBackgroundTasks = {
     getRunningTasks: (threadId: string) => ManagedBackgroundTask[];
 };
 export type InstanceAiSandboxSettings = {
-    resolveDaytonaConfig: (user: User) => Promise<{
+    resolveDaytonaConfig: () => Promise<{
         apiUrl?: string;
         apiKey?: string;
     }>;
-    resolveN8nSandboxConfig: (user: User) => Promise<{
+    resolveN8nSandboxConfig: () => Promise<{
         serviceUrl?: string;
         apiKey?: string;
     }>;
@@ -56,6 +57,7 @@ export declare class InstanceAiSandboxService {
     private readonly options;
     private readonly sandboxes;
     private readonly sandboxCreations;
+    private cacheGeneration;
     constructor(options: InstanceAiSandboxServiceOptions);
     private get logger();
     private get instanceAiConfig();
@@ -65,6 +67,8 @@ export declare class InstanceAiSandboxService {
     getOrCreateWorkspace(threadId: string, user: User, context: InstanceAiContext): Promise<RuntimeSandboxEntry | undefined>;
     private ensureWorkspaceSetup;
     private createWorkspaceEntry;
+    private resolveSandboxCacheState;
+    invalidateCachedWorkspaces(): void;
     private evictSandboxEntry;
     destroySandbox(threadId: string, reason?: string): Promise<void>;
     private get sandboxTtlMs();

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InstanceAiSandboxService = void 0;
+const node_crypto_1 = require("node:crypto");
 const instance_ai_1 = require("@n8n/instance-ai");
 const n8n_workflow_1 = require("n8n-workflow");
 const nanoid_1 = require("nanoid");
@@ -11,6 +12,9 @@ const SANDBOX_NAME_MAX_LEN = 63;
 const SANDBOX_LABEL_MAX_LEN = 63;
 const NAME_PREFIX_SLUG_MAX_LEN = 24;
 const DEFAULT_SANDBOX_TTL_MS = 15 * 60 * 1000;
+function sandboxConfigFingerprint(config) {
+    return (0, node_crypto_1.createHash)('sha256').update(JSON.stringify(config)).digest('hex');
+}
 function slugifySandboxName(value, maxLen) {
     const slug = value
         .toLowerCase()
@@ -72,6 +76,7 @@ class InstanceAiSandboxService {
         this.options = options;
         this.sandboxes = new Map();
         this.sandboxCreations = new Map();
+        this.cacheGeneration = 0;
     }
     get logger() {
         return this.options.logger;
@@ -81,7 +86,9 @@ class InstanceAiSandboxService {
     }
     getSandboxConfigFromEnv() {
         const { sandboxEnabled, sandboxProvider, daytonaApiUrl, daytonaApiKey, n8nSandboxServiceUrl, n8nSandboxServiceApiKey, sandboxImage, sandboxSnapshot, sandboxTimeout, sandboxNamePrefix, sandboxEphemeral, sandboxAutoStopMinutes, sandboxAutoArchiveMinutes, sandboxAutoDeleteMinutes, daytonaTokenRefreshSkewMs, } = this.instanceAiConfig;
-        const provider = (0, sandbox_provider_1.normalizeSandboxProvider)(sandboxProvider);
+        const provider = this.options.aiService.isProxyEnabled()
+            ? 'daytona'
+            : (0, sandbox_provider_1.normalizeSandboxProvider)(sandboxProvider);
         if (!sandboxEnabled) {
             return {
                 enabled: false,
@@ -134,14 +141,14 @@ class InstanceAiSandboxService {
                     },
                 };
             }
-            const daytona = await this.options.settingsService.resolveDaytonaConfig(user);
+            const daytona = await this.options.settingsService.resolveDaytonaConfig();
             return {
                 ...base,
                 daytonaApiUrl: daytona.apiUrl ?? base.daytonaApiUrl,
                 daytonaApiKey: daytona.apiKey ?? base.daytonaApiKey,
             };
         }
-        const sandbox = await this.options.settingsService.resolveN8nSandboxConfig(user);
+        const sandbox = await this.options.settingsService.resolveN8nSandboxConfig();
         return {
             ...base,
             serviceUrl: sandbox.serviceUrl ?? base.serviceUrl,
@@ -149,9 +156,15 @@ class InstanceAiSandboxService {
         };
     }
     async getOrCreateWorkspaceEntry(threadId, user) {
+        const cacheGeneration = this.cacheGeneration;
+        const cacheState = await this.resolveSandboxCacheState(user);
+        if (cacheGeneration !== this.cacheGeneration) {
+            return await this.getOrCreateWorkspaceEntry(threadId, user);
+        }
         const existing = this.sandboxes.get(threadId);
         if (existing) {
-            if (this.isSandboxEntryExpired(existing) && !this.isSandboxInUse(threadId)) {
+            if (existing.configFingerprint !== cacheState.fingerprint ||
+                (this.isSandboxEntryExpired(existing) && !this.isSandboxInUse(threadId))) {
                 this.evictSandboxEntry(threadId, existing);
             }
             else {
@@ -160,15 +173,25 @@ class InstanceAiSandboxService {
             }
         }
         const pending = this.sandboxCreations.get(threadId);
-        if (pending)
-            return await pending;
-        const creation = this.createWorkspaceEntry(threadId, user);
-        this.sandboxCreations.set(threadId, creation);
+        if (pending?.fingerprint === cacheState.fingerprint)
+            return await pending.promise;
+        const creation = this.createWorkspaceEntry(threadId, user, cacheState);
+        const pendingCreation = { fingerprint: cacheState.fingerprint, promise: creation };
+        this.sandboxCreations.set(threadId, pendingCreation);
         try {
-            return await creation;
+            const entry = await creation;
+            if (entry &&
+                cacheGeneration === this.cacheGeneration &&
+                this.sandboxCreations.get(threadId) === pendingCreation) {
+                this.sandboxes.set(threadId, entry);
+                this.scheduleSandboxExpiry(threadId, entry);
+            }
+            return entry;
         }
         finally {
-            this.sandboxCreations.delete(threadId);
+            if (this.sandboxCreations.get(threadId) === pendingCreation) {
+                this.sandboxCreations.delete(threadId);
+            }
         }
     }
     async getOrCreateWorkspace(threadId, user, context) {
@@ -189,8 +212,8 @@ class InstanceAiSandboxService {
         });
         await entry.setupPromise;
     }
-    async createWorkspaceEntry(threadId, user) {
-        const config = withThreadScopedSandboxIdentity(await this.resolveSandboxConfig(user), threadId);
+    async createWorkspaceEntry(threadId, user, cacheState) {
+        const config = withThreadScopedSandboxIdentity(cacheState.config ?? (await this.resolveSandboxConfig(user)), threadId);
         if (!config.enabled)
             return undefined;
         const sandbox = await (0, instance_ai_1.createSandbox)(config, {
@@ -215,14 +238,32 @@ class InstanceAiSandboxService {
         const entry = {
             sandbox,
             workspace,
+            configFingerprint: cacheState.fingerprint,
             setupComplete: false,
             setupPromise: undefined,
             expiresAt: this.nextSandboxExpiry(),
         };
-        this.sandboxes.set(threadId, entry);
-        this.scheduleSandboxExpiry(threadId, entry);
         return entry;
     }
+    async resolveSandboxCacheState(user) {
+        if (this.options.aiService.isProxyEnabled()) {
+            return {
+                fingerprint: sandboxConfigFingerprint({
+                    mode: 'proxy',
+                    config: this.getSandboxConfigFromEnv(),
+                }),
+            };
+        }
+        const config = await this.resolveSandboxConfig(user);
+        return { config, fingerprint: sandboxConfigFingerprint(config) };
+    }
+    invalidateCachedWorkspaces() {
+        this.cacheGeneration++;
+        this.sandboxCreations.clear();
+        for (const [threadId, entry] of this.sandboxes) {
+            this.evictSandboxEntry(threadId, entry);
+        }
+    }
     evictSandboxEntry(threadId, entry) {
         if (this.sandboxes.get(threadId) !== entry)
             return;

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

@@ -1 +1 @@
-{"version":3,"file":"instance-ai-sandbox.service.js","sourceRoot":"","sources":["../../../../src/modules/instance-ai/sandbox/instance-ai-sandbox.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"instance-ai-sandbox.service.js","sourceRoot":"","sources":["../../../../src/modules/instance-ai/sandbox/instance-ai-sandbox.service.ts"],"names":[],"mappings":"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"}

package/dist/modules/mcp/mcp-protected-resource.d.ts

@@ -17,6 +17,7 @@ export declare class McpProtectedResource implements ProtectedResource {
     constructor(urlService: UrlService, mcpSettingsService: McpSettingsService, mcpConfig: McpConfig, globalConfig: GlobalConfig);
     getScopeTools(): Record<string, string[]>;
     getResourceUrl(): string;
+    getProtectedResourceMetadataUrl(): string;
     getResourceUrls(): string[];
     getAudiences(): string[];
     getAllowedRedirectUris(): Promise<string[]>;

package/dist/modules/mcp/mcp-protected-resource.js

@@ -46,6 +46,10 @@ let McpProtectedResource = class McpProtectedResource {
         const baseUrl = this.urlService.getInstanceBaseUrl().replace(/\/$/, '');
         return `${baseUrl}${MCP_RESOURCE_PATH}`;
     }
+    getProtectedResourceMetadataUrl() {
+        const url = new URL(this.getResourceUrl());
+        return `${url.origin}/.well-known/oauth-protected-resource${url.pathname}`;
+    }
     getResourceUrls() {
         const instanceUrl = `${this.urlService.getInstanceBaseUrl().replace(/\/$/, '')}${MCP_RESOURCE_PATH}`;
         return [...new Set([this.getResourceUrl(), instanceUrl])];

package/dist/modules/mcp/mcp-protected-resource.js.map

@@ -1 +1 @@
-{"version":3,"file":"mcp-protected-resource.js","sourceRoot":"","sources":["../../../src/modules/mcp/mcp-protected-resource.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,8CAAqD;AACrD,wCAA2C;AAC3C,gCAAkC;AAElC,6CAA6D;AAC7D,6CAAyC;AACzC,iEAA4D;AAE5D,wDAAoD;AAGvC,QAAA,wBAAwB,GAAG,cAAc,CAAC;AAM1C,QAAA,gBAAgB,GAAa,CAAC,GAAG,+BAAmB,CAAC,CAAC;AAEnE,MAAM,iBAAiB,GAAG,kBAAkB,CAAC;AAI7C,MAAM,mBAAmB,GAAG,gBAAgB,CAAC;AAYtC,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IAYhC,YACkB,UAAsB,EACtB,kBAAsC,EACtC,SAAoB,EACpB,YAA0B;QAH1B,eAAU,GAAV,UAAU,CAAY;QACtB,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,cAAS,GAAT,SAAS,CAAW;QACpB,iBAAY,GAAZ,YAAY,CAAc;QAfnC,OAAE,GAAG,QAAA,wBAAwB,CAAC;QAE9B,WAAM,GAAG,QAAA,gBAAgB,CAAC;QAO1B,cAAS,GAAG,IAAI,CAAC;IAOvB,CAAC;IAMJ,aAAa;QACZ,MAAM,cAAc,GAAG,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,iBAAiB,CAAC;QACrE,MAAM,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC;QAErD,OAAO,MAAM,CAAC,WAAW,CACxB,MAAM,CAAC,OAAO,CAAC,2BAAc,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC;YACtD,KAAK;YACL,KAAK,CAAC,MAAM,CACX,CAAC,IAAI,EAAE,EAAE,CACR,CAAC,cAAc,IAAI,CAAC,0BAAa,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,YAAY,IAAI,IAAI,KAAK,WAAW,CAAC,CACxF;SACD,CAAC,CACF,CAAC;IACH,CAAC;IAED,cAAc;QAGb,IAAI,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;YAC5B,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,GAAG,iBAAiB,EAAE,CAAC;QACxD,CAAC;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,kBAAkB,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QACxE,OAAO,GAAG,OAAO,GAAG,iBAAiB,EAAE,CAAC;IACzC,CAAC;IAQD,eAAe;QACd,MAAM,WAAW,GAAG,GAAG,IAAI,CAAC,UAAU,CAAC,kBAAkB,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,GAAG,iBAAiB,EAAE,CAAC;QACrG,OAAO,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,cAAc,EAAE,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC;IAC3D,CAAC;IAED,YAAY;QAGX,OAAO,CAAC,GAAG,IAAI,CAAC,eAAe,EAAE,EAAE,mBAAmB,CAAC,CAAC;IACzD,CAAC;IAED,KAAK,CAAC,sBAAsB;QAC3B,OAAO,MAAM,IAAI,CAAC,kBAAkB,CAAC,sBAAsB,EAAE,CAAC;IAC/D,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,KAAW;QAI1B,OAAO,MAAM,IAAI,CAAC,kBAAkB,CAAC,UAAU,EAAE,CAAC;IACnD,CAAC;CACD,CAAA;;+BA3EY,oBAAoB;IADhC,IAAA,YAAO,GAAE;qCAcqB,wBAAU,EACF,yCAAkB,EAC3B,sBAAS,EACN,qBAAY;GAhBhC,oBAAoB,CA2EhC"}
+{"version":3,"file":"mcp-protected-resource.js","sourceRoot":"","sources":["../../../src/modules/mcp/mcp-protected-resource.ts"],"names":[],"mappings":"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"}

package/dist/modules/mcp/mcp-server-middleware.service.js

@@ -98,7 +98,8 @@ let McpServerMiddlewareService = class McpServerMiddlewareService {
     }
     responseWithUnauthorized(res, req, context) {
         this.trackUnauthorizedEvent(req, context);
-        res.header('WWW-Authenticate', 'Bearer realm="n8n MCP Server"');
+        const prmUrl = this.mcpProtectedResource.getProtectedResourceMetadataUrl();
+        res.header('WWW-Authenticate', `Bearer realm="n8n MCP Server", resource_metadata="${prmUrl}"`);
         res.status(401).send({
             message: `${mcp_constants_1.UNAUTHORIZED_ERROR_MESSAGE}${context?.error_details ? ': ' + context.error_details : ''}`,
         });

package/dist/modules/mcp/mcp-server-middleware.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"mcp-server-middleware.service.js","sourceRoot":"","sources":["../../../src/modules/mcp/mcp-server-middleware.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"mcp-server-middleware.service.js","sourceRoot":"","sources":["../../../src/modules/mcp/mcp-server-middleware.service.ts"],"names":[],"mappings":"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"}

package/dist/modules/mcp/mcp.controller.d.ts

@@ -3,6 +3,7 @@ import { AuthenticatedRequest } from '@n8n/db';
 import type { Request, Response } from 'express';
 import { ErrorReporter } from 'n8n-core';
 import { Telemetry } from '../../telemetry';
+import { McpProtectedResource } from './mcp-protected-resource';
 import { McpService } from './mcp.service';
 import { McpSettingsService } from './mcp.settings.service';
 export type FlushableResponse = Response & {
@@ -14,7 +15,8 @@ export declare class McpController {
     private readonly mcpSettingsService;
     private readonly telemetry;
     private readonly logger;
-    constructor(errorReporter: ErrorReporter, mcpService: McpService, mcpSettingsService: McpSettingsService, telemetry: Telemetry, logger: Logger);
+    private readonly mcpProtectedResource;
+    constructor(errorReporter: ErrorReporter, mcpService: McpService, mcpSettingsService: McpSettingsService, telemetry: Telemetry, logger: Logger, mcpProtectedResource: McpProtectedResource);
     private setCorsHeaders;
     discoverAuthSchemeHead(_req: Request, res: Response): Promise<void>;
     handleGet(req: AuthenticatedRequest, res: FlushableResponse): Promise<void>;

package/dist/modules/mcp/mcp.controller.js

@@ -15,6 +15,7 @@ const decorators_1 = require("@n8n/decorators");
 const di_1 = require("@n8n/di");
 const n8n_core_1 = require("n8n-core");
 const telemetry_1 = require("../../telemetry");
+const mcp_protected_resource_1 = require("./mcp-protected-resource");
 const mcp_server_middleware_service_1 = require("./mcp-server-middleware.service");
 const mcp_config_1 = require("./mcp.config");
 const mcp_constants_1 = require("./mcp.constants");
@@ -25,12 +26,13 @@ const mcp_utils_1 = require("./mcp.utils");
 const getAuthMiddleware = () => di_1.Container.get(mcp_server_middleware_service_1.McpServerMiddlewareService).getAuthMiddleware();
 const mcpConfig = di_1.Container.get(mcp_config_1.McpConfig);
 let McpController = class McpController {
-    constructor(errorReporter, mcpService, mcpSettingsService, telemetry, logger) {
+    constructor(errorReporter, mcpService, mcpSettingsService, telemetry, logger, mcpProtectedResource) {
         this.errorReporter = errorReporter;
         this.mcpService = mcpService;
         this.mcpSettingsService = mcpSettingsService;
         this.telemetry = telemetry;
         this.logger = logger;
+        this.mcpProtectedResource = mcpProtectedResource;
     }
     setCorsHeaders(res) {
         res.header('Access-Control-Allow-Origin', '*');
@@ -41,7 +43,8 @@ let McpController = class McpController {
     }
     async discoverAuthSchemeHead(_req, res) {
         this.setCorsHeaders(res);
-        res.header('WWW-Authenticate', 'Bearer realm="n8n MCP Server"');
+        const prmUrl = this.mcpProtectedResource.getProtectedResourceMetadataUrl();
+        res.header('WWW-Authenticate', `Bearer realm="n8n MCP Server", resource_metadata="${prmUrl}"`);
         res.status(401).end();
     }
     async handleGet(req, res) {
@@ -52,8 +55,8 @@ let McpController = class McpController {
             return;
         }
         try {
-            const { enabled: mcpAppsEnabled } = await this.mcpService.resolveMcpAppsVariant(req.user);
-            await this.handleTransportRequest(req, res, mcpAppsEnabled);
+            const featureFlags = await this.mcpService.resolveFeatureFlags(req.user);
+            await this.handleTransportRequest(req, res, featureFlags);
         }
         catch (error) {
             this.errorReporter.error(error);
@@ -94,14 +97,15 @@ let McpController = class McpController {
             res.status(403).json({ message: mcp_constants_1.MCP_ACCESS_DISABLED_ERROR_MESSAGE });
             return;
         }
-        const mcpAppsResolution = await this.mcpService.resolveMcpAppsVariant(req.user);
+        const featureFlags = await this.mcpService.resolveFeatureFlags(req.user);
         const telemetryPayload = {
             ...baseTelemetryPayload,
-            mcp_apps_enabled: mcpAppsResolution.enabled,
-            mcp_apps_variant: mcpAppsResolution.variant,
+            mcp_apps_enabled: featureFlags.mcpApps.enabled,
+            mcp_apps_variant: featureFlags.mcpApps.variant,
+            mcp_canvas_groups_enabled: featureFlags.canvasGroupsEnabled,
         };
         try {
-            await this.handleTransportRequest(req, res, mcpAppsResolution.enabled, req.body);
+            await this.handleTransportRequest(req, res, featureFlags, req.body);
             if (isInitializationRequest) {
                 this.trackConnectionEvent({
                     ...telemetryPayload,
@@ -133,10 +137,10 @@ let McpController = class McpController {
             }
         }
     }
-    async handleTransportRequest(req, res, mcpAppsEnabled, body) {
+    async handleTransportRequest(req, res, featureFlags, body) {
         const { StreamableHTTPServerTransport } = await import('@modelcontextprotocol/sdk/server/streamableHttp.js');
         const grantedScopes = req.mcpScopes;
-        const server = await this.mcpService.getServer(req.user, mcpAppsEnabled, (0, mcp_utils_1.getClientInfo)(req), grantedScopes);
+        const server = await this.mcpService.getServer(req.user, featureFlags, (0, mcp_utils_1.getClientInfo)(req), grantedScopes);
         const transport = new StreamableHTTPServerTransport({
             sessionIdGenerator: undefined,
         });
@@ -185,6 +189,6 @@ __decorate([
 ], McpController.prototype, "build", null);
 exports.McpController = McpController = __decorate([
     (0, decorators_1.RootLevelController)('/mcp-server'),
-    __metadata("design:paramtypes", [n8n_core_1.ErrorReporter, mcp_service_1.McpService, mcp_settings_service_1.McpSettingsService, telemetry_1.Telemetry, backend_common_1.Logger])
+    __metadata("design:paramtypes", [n8n_core_1.ErrorReporter, mcp_service_1.McpService, mcp_settings_service_1.McpSettingsService, telemetry_1.Telemetry, backend_common_1.Logger, mcp_protected_resource_1.McpProtectedResource])
 ], McpController);
 //# sourceMappingURL=mcp.controller.js.map

package/dist/modules/mcp/mcp.controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"mcp.controller.js","sourceRoot":"","sources":["../../../src/modules/mcp/mcp.controller.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"mcp.controller.js","sourceRoot":"","sources":["../../../src/modules/mcp/mcp.controller.ts"],"names":[],"mappings":"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"}

package/dist/modules/mcp/mcp.service.d.ts

@@ -32,6 +32,10 @@ export type McpAppsResolution = {
     enabled: boolean;
     variant: McpAppsTelemetryVariant;
 };
+export type McpFeatureFlags = {
+    mcpApps: McpAppsResolution;
+    canvasGroupsEnabled: boolean;
+};
 export declare class McpService {
     private readonly logger;
     private readonly executionsConfig;
@@ -67,9 +71,10 @@ export declare class McpService {
     private readonly aiGatewayService;
     private readonly pendingResponses;
     constructor(logger: Logger, executionsConfig: ExecutionsConfig, instanceSettings: InstanceSettings, workflowFinderService: WorkflowFinderService, workflowService: WorkflowService, urlService: UrlService, credentialsService: CredentialsService, activeExecutions: ActiveExecutions, globalConfig: GlobalConfig, telemetry: Telemetry, workflowRunner: WorkflowRunner, roleService: RoleService, projectService: ProjectService, nodeCatalogService: NodeCatalogService, workflowCreationService: WorkflowCreationService, nodeTypes: NodeTypes, projectRepository: ProjectRepository, folderRepository: FolderRepository, sharedWorkflowRepository: SharedWorkflowRepository, executionRepository: ExecutionRepository, executionService: ExecutionService, dataTableProxyService: DataTableProxyService, collaborationService: CollaborationService, nodeResourceExplorerService: NodeResourceExplorerService, tagService: TagService, licenseState: LicenseState, postHogClient: PostHogClient, workflowHistoryService: WorkflowHistoryService, workflowsConfig: WorkflowsConfig, workflowPublishedDataService: WorkflowPublishedDataService, subworkflowPolicyChecker: SubworkflowPolicyChecker, aiGatewayService: AiGatewayService);
-    resolveMcpAppsVariant(user: User): Promise<McpAppsResolution>;
+    resolveFeatureFlags(user: User): Promise<McpFeatureFlags>;
+    private resolveMcpApps;
     private buildMcpAppTelemetryConfig;
-    getServer(user: User, mcpAppsEnabled: boolean, clientInfo?: McpClientInfo, grantedScopes?: string[]): Promise<McpServer>;
+    getServer(user: User, featureFlags: McpFeatureFlags, clientInfo?: McpClientInfo, grantedScopes?: string[]): Promise<McpServer>;
     private registerBuilderTools;
     get isQueueMode(): boolean;
     createPendingResponse(executionId: string): IDeferredPromise<IRun | undefined>;