n8n 2.25.6 → 2.26.0

package/dist/modules/instance-ai/trace-replay-state.js.map

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

package/dist/modules/instance-ai/workflow-verification-obligation-service.d.ts

@@ -0,0 +1,20 @@
+import { type PlannedTaskGraph, type PlannedWorkflowVerification, type WorkflowBuildOutcome, type WorkflowLoopWorkItemRecord, type WorkflowVerificationObligation, type WorkflowVerificationObligationSource } from '@n8n/instance-ai';
+import type { TypeORMAgentMemory } from './storage/typeorm-agent-memory';
+export declare function parseWorkflowBuildOutcome(outcome: Record<string, unknown> | undefined): WorkflowBuildOutcome | undefined;
+export declare class WorkflowVerificationObligationService {
+    private readonly agentMemory;
+    constructor(agentMemory: TypeORMAgentMemory);
+    private storage;
+    isPlannedRecord(record: WorkflowLoopWorkItemRecord): boolean;
+    getObligation(threadId: string, workItemId: string, options: {
+        source: WorkflowVerificationObligationSource;
+        plannedTaskId?: string;
+    }): Promise<WorkflowVerificationObligation | undefined>;
+    obligationFromRecord(threadId: string, record: WorkflowLoopWorkItemRecord, options: {
+        source: WorkflowVerificationObligationSource;
+        plannedTaskId?: string;
+    }): WorkflowVerificationObligation;
+    findPendingPlannedWorkflowVerification(threadId: string, graph: PlannedTaskGraph): Promise<PlannedWorkflowVerification | undefined>;
+    revalidatePlannedWorkflowVerification(threadId: string, verification: PlannedWorkflowVerification): Promise<PlannedWorkflowVerification | undefined>;
+    private pendingPlannedWorkflowVerificationFromTask;
+}

package/dist/modules/instance-ai/workflow-verification-obligation-service.js

@@ -0,0 +1,59 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WorkflowVerificationObligationService = void 0;
+exports.parseWorkflowBuildOutcome = parseWorkflowBuildOutcome;
+const instance_ai_1 = require("@n8n/instance-ai");
+function parseWorkflowBuildOutcome(outcome) {
+    const parsed = instance_ai_1.workflowBuildOutcomeSchema.safeParse(outcome);
+    return parsed.success ? parsed.data : undefined;
+}
+class WorkflowVerificationObligationService {
+    constructor(agentMemory) {
+        this.agentMemory = agentMemory;
+    }
+    storage() {
+        return new instance_ai_1.WorkflowLoopStorage(this.agentMemory);
+    }
+    isPlannedRecord(record) {
+        return (0, instance_ai_1.isPlannedWorkflowBuildOwner)((0, instance_ai_1.resolveWorkflowBuildOwner)(record.state, record.lastBuildOutcome));
+    }
+    async getObligation(threadId, workItemId, options) {
+        const record = await this.storage().getWorkItem(threadId, workItemId);
+        if (!record)
+            return undefined;
+        return this.obligationFromRecord(threadId, record, options);
+    }
+    obligationFromRecord(threadId, record, options) {
+        return (0, instance_ai_1.deriveWorkflowVerificationObligation)(threadId, record, options);
+    }
+    async findPendingPlannedWorkflowVerification(threadId, graph) {
+        for (const task of graph.tasks) {
+            if (task.kind !== 'build-workflow' || task.status !== 'succeeded')
+                continue;
+            const verification = await this.pendingPlannedWorkflowVerificationFromTask(threadId, task);
+            if (verification)
+                return verification;
+        }
+        return undefined;
+    }
+    async revalidatePlannedWorkflowVerification(threadId, verification) {
+        return await this.pendingPlannedWorkflowVerificationFromTask(threadId, verification.task, verification.outcome);
+    }
+    async pendingPlannedWorkflowVerificationFromTask(threadId, task, fallbackOutcome) {
+        const taskOutcome = parseWorkflowBuildOutcome(task.outcome);
+        const baseOutcome = taskOutcome ?? fallbackOutcome;
+        if (!baseOutcome)
+            return undefined;
+        const options = { source: 'planned', plannedTaskId: task.id };
+        const record = await this.storage().getWorkItem(threadId, baseOutcome.workItemId);
+        const outcome = record?.lastBuildOutcome ?? baseOutcome;
+        const obligation = record?.lastBuildOutcome
+            ? this.obligationFromRecord(threadId, record, options)
+            : (0, instance_ai_1.deriveWorkflowVerificationObligationFromOutcome)(threadId, outcome, options);
+        if (!(0, instance_ai_1.isWorkflowVerificationObligationUnsettled)(obligation))
+            return undefined;
+        return { task, obligation, outcome };
+    }
+}
+exports.WorkflowVerificationObligationService = WorkflowVerificationObligationService;
+//# sourceMappingURL=workflow-verification-obligation-service.js.map

package/dist/modules/instance-ai/workflow-verification-obligation-service.js.map

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

package/dist/modules/instance-ai/workflow-verification-task-projector.d.ts

@@ -0,0 +1,21 @@
+import type { TaskList } from '@n8n/api-types';
+import type { Logger } from '@n8n/backend-common';
+import { type ManagedBackgroundTask, type PlannedTaskGraph } from '@n8n/instance-ai';
+import type { InProcessEventBus } from './event-bus/in-process-event-bus';
+import type { TypeORMAgentMemory } from './storage/typeorm-agent-memory';
+import { type WorkflowVerificationObligationService } from './workflow-verification-obligation-service';
+export declare class WorkflowVerificationTaskProjector {
+    private readonly agentMemory;
+    private readonly eventBus;
+    private readonly logger;
+    private readonly obligations;
+    constructor(agentMemory: TypeORMAgentMemory, eventBus: InProcessEventBus, logger: Logger, obligations: WorkflowVerificationObligationService);
+    projectPlannedTaskList(threadId: string, graph: PlannedTaskGraph): Promise<TaskList>;
+    private projectPlannedVerifyRow;
+    syncFromBackgroundTask(task: ManagedBackgroundTask): Promise<void>;
+    private directItemsFromTask;
+    private directItemsFromCompletedTask;
+    syncFromWorkflowLoop(threadId: string, runId: string): Promise<void>;
+    private upsertItems;
+    private saveAndPublish;
+}

package/dist/modules/instance-ai/workflow-verification-task-projector.js

@@ -0,0 +1,323 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WorkflowVerificationTaskProjector = void 0;
+const instance_ai_1 = require("@n8n/instance-ai");
+const workflow_verification_obligation_service_1 = require("./workflow-verification-obligation-service");
+const ORCHESTRATOR_AGENT_ID = 'agent-001';
+const BUILD_DESCRIPTION = 'Build workflow';
+const VERIFY_DESCRIPTION = 'Verify workflow';
+const DETAIL = {
+    building: 'Building workflow',
+    waitingForBuild: 'Waiting for build',
+    buildIncomplete: 'Build did not complete',
+    verificationPending: 'Verification pending',
+    verifying: 'Verifying workflow',
+    needsSetup: 'Needs setup',
+    couldNotVerify: 'Could not verify automatically',
+    noWorkflow: 'No workflow to verify',
+    submitted: 'Submitted',
+    blocked: 'Blocked',
+    cancelled: 'Cancelled',
+};
+function getErrorMessage(error) {
+    return error instanceof Error ? error.message : String(error);
+}
+function verifyRowId(buildTaskId) {
+    return `${buildTaskId}:verify`;
+}
+function formatVerifiedDetail(evidence) {
+    if (!evidence?.attempted || !evidence.success)
+        return 'Verified';
+    const parts = [
+        evidence.executionId ? `execution ${evidence.executionId}` : '',
+        typeof evidence.evidence?.producedOutputRows === 'number'
+            ? `${evidence.evidence.producedOutputRows} output rows`
+            : '',
+    ].filter((part) => part.length > 0);
+    return parts.length > 0 ? `Verified - ${parts.join(', ')}` : 'Verified';
+}
+function obligationDetail(obligation) {
+    switch (obligation.status) {
+        case 'pending_build':
+            return DETAIL.building;
+        case 'ready_to_verify':
+            return DETAIL.verificationPending;
+        case 'verifying':
+            return DETAIL.verifying;
+        case 'verified':
+            return formatVerifiedDetail(obligation.evidence);
+        case 'needs_setup':
+            return DETAIL.needsSetup;
+        case 'not_verifiable':
+            return DETAIL.couldNotVerify;
+        case 'blocked':
+            return obligation.blockingReason ?? DETAIL.blocked;
+    }
+}
+function obligationStatus(obligation) {
+    switch (obligation.status) {
+        case 'pending_build':
+        case 'ready_to_verify':
+        case 'verifying':
+            return 'in_progress';
+        case 'verified':
+        case 'needs_setup':
+        case 'not_verifiable':
+            return 'done';
+        case 'blocked':
+            return 'failed';
+    }
+}
+function projectedPlannedStatus(status) {
+    switch (status) {
+        case 'planned':
+            return 'todo';
+        case 'running':
+            return 'in_progress';
+        case 'succeeded':
+            return 'done';
+        case 'failed':
+            return 'failed';
+        case 'cancelled':
+            return 'cancelled';
+    }
+}
+function plannedBuildDetail(task) {
+    if (task.kind !== 'build-workflow')
+        return undefined;
+    if (task.status === 'running')
+        return DETAIL.building;
+    if (task.status === 'failed')
+        return task.error ?? DETAIL.blocked;
+    if (task.status === 'cancelled')
+        return task.error ?? DETAIL.cancelled;
+    const outcome = (0, workflow_verification_obligation_service_1.parseWorkflowBuildOutcome)(task.outcome);
+    if (!outcome)
+        return task.status === 'succeeded' ? DETAIL.submitted : undefined;
+    return outcome.submitted || outcome.workflowId ? DETAIL.submitted : undefined;
+}
+function verifyRow(buildTaskId, obligation) {
+    if (obligation.status === 'pending_build') {
+        return {
+            id: verifyRowId(buildTaskId),
+            description: VERIFY_DESCRIPTION,
+            detail: DETAIL.waitingForBuild,
+            status: 'todo',
+        };
+    }
+    return {
+        id: verifyRowId(buildTaskId),
+        description: VERIFY_DESCRIPTION,
+        detail: obligationDetail(obligation),
+        status: obligationStatus(obligation),
+    };
+}
+function buildRow(buildTaskId, outcome, obligation) {
+    const submitted = outcome?.submitted === true || !!obligation.workflowId;
+    const blockedBeforeSubmit = obligation.status === 'blocked' && !submitted;
+    return {
+        id: buildTaskId,
+        description: BUILD_DESCRIPTION,
+        detail: submitted ? DETAIL.submitted : obligationDetail(obligation),
+        status: blockedBeforeSubmit ? 'failed' : submitted ? 'done' : 'in_progress',
+    };
+}
+function directTaskItems(buildTaskId, outcome, obligation) {
+    return [buildRow(buildTaskId, outcome, obligation), verifyRow(buildTaskId, obligation)];
+}
+function upsertTaskItemsInOrder(existingTasks, items) {
+    const tasks = [...existingTasks];
+    let changed = false;
+    for (const [itemIndex, item] of items.entries()) {
+        const existingIndex = tasks.findIndex((task) => task.id === item.id);
+        if (existingIndex >= 0) {
+            if (taskItemsEqual(tasks[existingIndex], item))
+                continue;
+            tasks[existingIndex] = item;
+            changed = true;
+            continue;
+        }
+        const previousItem = items[itemIndex - 1];
+        const previousIndex = previousItem
+            ? tasks.findIndex((task) => task.id === previousItem.id)
+            : -1;
+        tasks.splice(previousIndex >= 0 ? previousIndex + 1 : tasks.length, 0, item);
+        changed = true;
+    }
+    return { tasks, changed };
+}
+function taskItemsEqual(first, second) {
+    return (first.id === second.id &&
+        first.description === second.description &&
+        first.detail === second.detail &&
+        first.status === second.status);
+}
+class WorkflowVerificationTaskProjector {
+    constructor(agentMemory, eventBus, logger, obligations) {
+        this.agentMemory = agentMemory;
+        this.eventBus = eventBus;
+        this.logger = logger;
+        this.obligations = obligations;
+    }
+    async projectPlannedTaskList(threadId, graph) {
+        const tasks = [];
+        for (const task of graph.tasks) {
+            tasks.push({
+                id: task.id,
+                description: task.title,
+                detail: plannedBuildDetail(task),
+                status: projectedPlannedStatus(task.status),
+            });
+            if (task.kind === 'build-workflow') {
+                tasks.push(await this.projectPlannedVerifyRow(threadId, task));
+            }
+        }
+        return { tasks };
+    }
+    async projectPlannedVerifyRow(threadId, task) {
+        const id = verifyRowId(task.id);
+        if (task.status === 'planned' || task.status === 'running') {
+            return {
+                id,
+                description: VERIFY_DESCRIPTION,
+                detail: DETAIL.waitingForBuild,
+                status: 'todo',
+            };
+        }
+        if (task.status === 'failed' || task.status === 'cancelled') {
+            return {
+                id,
+                description: VERIFY_DESCRIPTION,
+                detail: DETAIL.buildIncomplete,
+                status: 'cancelled',
+            };
+        }
+        const outcome = (0, workflow_verification_obligation_service_1.parseWorkflowBuildOutcome)(task.outcome);
+        if (!outcome) {
+            return {
+                id,
+                description: VERIFY_DESCRIPTION,
+                detail: DETAIL.verificationPending,
+                status: 'in_progress',
+            };
+        }
+        const options = { source: 'planned', plannedTaskId: task.id };
+        const obligation = (await this.obligations.getObligation(threadId, outcome.workItemId, options)) ??
+            (0, instance_ai_1.deriveWorkflowVerificationObligationFromOutcome)(threadId, outcome, options);
+        return verifyRow(task.id, obligation);
+    }
+    async syncFromBackgroundTask(task) {
+        if (task.plannedTaskId || task.parentCheckpointId || task.role !== 'workflow-builder')
+            return;
+        const items = await this.directItemsFromTask(task);
+        if (!items)
+            return;
+        await this.upsertItems(task.threadId, task.runId, items);
+    }
+    async directItemsFromTask(task) {
+        const build = { id: task.taskId, description: BUILD_DESCRIPTION };
+        const verify = { id: verifyRowId(task.taskId), description: VERIFY_DESCRIPTION };
+        switch (task.status) {
+            case 'running':
+                return [
+                    { ...build, detail: DETAIL.building, status: 'in_progress' },
+                    { ...verify, detail: DETAIL.waitingForBuild, status: 'todo' },
+                ];
+            case 'failed':
+                return [
+                    { ...build, detail: task.error ?? DETAIL.blocked, status: 'failed' },
+                    { ...verify, detail: DETAIL.buildIncomplete, status: 'cancelled' },
+                ];
+            case 'cancelled':
+                return [
+                    { ...build, detail: task.error ?? DETAIL.cancelled, status: 'cancelled' },
+                    { ...verify, detail: DETAIL.buildIncomplete, status: 'cancelled' },
+                ];
+            case 'completed':
+                return await this.directItemsFromCompletedTask(task, build, verify);
+        }
+    }
+    async directItemsFromCompletedTask(task, build, verify) {
+        const outcome = (0, workflow_verification_obligation_service_1.parseWorkflowBuildOutcome)(task.outcome);
+        const workItemId = task.workItemId ?? outcome?.workItemId;
+        if (!workItemId) {
+            return [
+                { ...build, detail: DETAIL.submitted, status: 'done' },
+                { ...verify, detail: DETAIL.noWorkflow, status: 'cancelled' },
+            ];
+        }
+        const obligation = await this.obligations.getObligation(task.threadId, workItemId, {
+            source: 'direct',
+        });
+        if (!obligation)
+            return undefined;
+        return directTaskItems(task.taskId, outcome, obligation);
+    }
+    async syncFromWorkflowLoop(threadId, runId) {
+        try {
+            const taskStorage = new instance_ai_1.ThreadTaskStorage(this.agentMemory);
+            const existing = await taskStorage.get(threadId);
+            if (!existing?.tasks.length)
+                return;
+            const records = await new instance_ai_1.WorkflowLoopStorage(this.agentMemory).listWorkItems(threadId);
+            const byBuildTaskId = new Map();
+            for (const record of records) {
+                if (this.obligations.isPlannedRecord(record))
+                    continue;
+                const obligation = this.obligations.obligationFromRecord(threadId, record, {
+                    source: 'direct',
+                });
+                if (obligation.taskId) {
+                    byBuildTaskId.set(obligation.taskId, { outcome: record.lastBuildOutcome, obligation });
+                }
+            }
+            let tasks = existing.tasks;
+            let changed = false;
+            for (const task of existing.tasks) {
+                const entry = byBuildTaskId.get(task.id);
+                if (!entry)
+                    continue;
+                const update = upsertTaskItemsInOrder(tasks, directTaskItems(task.id, entry.outcome, entry.obligation));
+                changed = changed || update.changed;
+                tasks = update.tasks;
+            }
+            if (!changed)
+                return;
+            await this.saveAndPublish(taskStorage, threadId, runId, { tasks });
+        }
+        catch (error) {
+            this.logger.warn('Failed to sync direct workflow builder task checklist items', {
+                threadId,
+                error: getErrorMessage(error),
+            });
+        }
+    }
+    async upsertItems(threadId, runId, items) {
+        try {
+            const taskStorage = new instance_ai_1.ThreadTaskStorage(this.agentMemory);
+            const existing = (await taskStorage.get(threadId)) ?? { tasks: [] };
+            const { tasks, changed } = upsertTaskItemsInOrder(existing.tasks, items);
+            if (!changed)
+                return;
+            await this.saveAndPublish(taskStorage, threadId, runId, { tasks });
+        }
+        catch (error) {
+            this.logger.warn('Failed to update direct workflow builder task checklist items', {
+                threadId,
+                taskIds: items.map((item) => item.id),
+                error: getErrorMessage(error),
+            });
+        }
+    }
+    async saveAndPublish(taskStorage, threadId, runId, taskList) {
+        await taskStorage.save(threadId, taskList);
+        this.eventBus.publish(threadId, {
+            type: 'tasks-update',
+            runId,
+            agentId: ORCHESTRATOR_AGENT_ID,
+            payload: { tasks: taskList },
+        });
+    }
+}
+exports.WorkflowVerificationTaskProjector = WorkflowVerificationTaskProjector;
+//# sourceMappingURL=workflow-verification-task-projector.js.map

package/dist/modules/instance-ai/workflow-verification-task-projector.js.map

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

package/dist/modules/mcp/database/entities/oauth-authorization-code.entity.d.ts

@@ -10,6 +10,7 @@ export declare class AuthorizationCode extends WithTimestamps {
     codeChallenge: string;
     codeChallengeMethod: string;
     state: string | null;
+    resource: string | null;
     expiresAt: number;
     used: boolean;
 }

package/dist/modules/mcp/database/entities/oauth-authorization-code.entity.js

@@ -54,6 +54,10 @@ __decorate([
     (0, typeorm_1.Column)({ type: String, nullable: true }),
     __metadata("design:type", Object)
 ], AuthorizationCode.prototype, "state", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', nullable: true }),
+    __metadata("design:type", Object)
+], AuthorizationCode.prototype, "resource", void 0);
 __decorate([
     (0, typeorm_1.Index)(),
     (0, typeorm_1.Column)({ type: 'int' }),

package/dist/modules/mcp/database/entities/oauth-authorization-code.entity.js.map

@@ -1 +1 @@
-{"version":3,"file":"oauth-authorization-code.entity.js","sourceRoot":"","sources":["../../../../../src/modules/mcp/database/entities/oauth-authorization-code.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gCAA+C;AAC/C,0CAAgE;AAEhE,+DAAoD;AAG7C,IAAM,iBAAiB,GAAvB,MAAM,iBAAkB,SAAQ,mBAAc;CAwCpD,CAAA;AAxCY,8CAAiB;AAE7B;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;;+CAC9B;AAOb;IALC,IAAA,mBAAS,EACT,GAAG,EAAE,CAAC,iCAAW,EACjB,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,kBAAkB,EACrC,EAAE,QAAQ,EAAE,SAAS,EAAE,CACvB;8BACO,iCAAW;iDAAC;AAIpB;IAFC,IAAA,eAAK,GAAE;IACP,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;;mDACR;AAGjB;IADC,IAAA,mBAAS,EAAC,GAAG,EAAE,CAAC,SAAI,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC;8BACzC,SAAI;+CAAC;AAIX;IAFC,IAAA,eAAK,GAAE;IACP,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;;iDACV;AAGf;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;;sDACL;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;;wDACH;AAGtB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;;8DACG;AAG5B;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gDACpB;AAIrB;IAFC,IAAA,eAAK,GAAE;IACP,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;;oDACN;AAGlB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;;+CAC5B;4BAvCF,iBAAiB;IAD7B,IAAA,gBAAM,EAAC,2BAA2B,CAAC;GACvB,iBAAiB,CAwC7B"}
+{"version":3,"file":"oauth-authorization-code.entity.js","sourceRoot":"","sources":["../../../../../src/modules/mcp/database/entities/oauth-authorization-code.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gCAA+C;AAC/C,0CAAgE;AAEhE,+DAAoD;AAG7C,IAAM,iBAAiB,GAAvB,MAAM,iBAAkB,SAAQ,mBAAc;CA2CpD,CAAA;AA3CY,8CAAiB;AAE7B;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;;+CAC9B;AAOb;IALC,IAAA,mBAAS,EACT,GAAG,EAAE,CAAC,iCAAW,EACjB,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,kBAAkB,EACrC,EAAE,QAAQ,EAAE,SAAS,EAAE,CACvB;8BACO,iCAAW;iDAAC;AAIpB;IAFC,IAAA,eAAK,GAAE;IACP,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;;mDACR;AAGjB;IADC,IAAA,mBAAS,EAAC,GAAG,EAAE,CAAC,SAAI,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC;8BACzC,SAAI;+CAAC;AAIX;IAFC,IAAA,eAAK,GAAE;IACP,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;;iDACV;AAGf;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;;sDACL;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;;wDACH;AAGtB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;;8DACG;AAG5B;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gDACpB;AAGrB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;mDACpB;AAIxB;IAFC,IAAA,eAAK,GAAE;IACP,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;;oDACN;AAGlB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;;+CAC5B;4BA1CF,iBAAiB;IAD7B,IAAA,gBAAM,EAAC,2BAA2B,CAAC;GACvB,iBAAiB,CA2C7B"}

package/dist/modules/mcp/mcp-oauth-authorization-code.service.d.ts

@@ -4,8 +4,10 @@ export declare class McpOAuthAuthorizationCodeService {
     private readonly authorizationCodeRepository;
     private readonly AUTHORIZATION_CODE_EXPIRY_MS;
     constructor(authorizationCodeRepository: AuthorizationCodeRepository);
-    createAuthorizationCode(clientId: string, userId: string, redirectUri: string, codeChallenge: string, state: string | null): Promise<string>;
+    createAuthorizationCode(clientId: string, userId: string, redirectUri: string, codeChallenge: string, state: string | null, resource?: string): Promise<string>;
     findAndValidateAuthorizationCode(authorizationCode: string, clientId: string): Promise<AuthorizationCode>;
+    findAuthorizationCode(code: string, clientId: string, redirectUri?: string): Promise<AuthorizationCode | null>;
     validateAndConsumeAuthorizationCode(authorizationCode: string, clientId: string, redirectUri?: string): Promise<AuthorizationCode>;
+    markAuthorizationCodeAsUsed(authorizationCode: string): Promise<void>;
     getCodeChallenge(authorizationCode: string, clientId: string): Promise<string>;
 }

package/dist/modules/mcp/mcp-oauth-authorization-code.service.js

@@ -14,12 +14,13 @@ const constants_1 = require("@n8n/constants");
 const di_1 = require("@n8n/di");
 const node_crypto_1 = require("node:crypto");
 const oauth_authorization_code_repository_1 = require("./database/repositories/oauth-authorization-code.repository");
+const errors_js_1 = require("@modelcontextprotocol/sdk/server/auth/errors.js");
 let McpOAuthAuthorizationCodeService = class McpOAuthAuthorizationCodeService {
     constructor(authorizationCodeRepository) {
         this.authorizationCodeRepository = authorizationCodeRepository;
         this.AUTHORIZATION_CODE_EXPIRY_MS = 10 * constants_1.Time.minutes.toMilliseconds;
     }
-    async createAuthorizationCode(clientId, userId, redirectUri, codeChallenge, state) {
+    async createAuthorizationCode(clientId, userId, redirectUri, codeChallenge, state, resource) {
         const code = (0, node_crypto_1.randomBytes)(32).toString('hex');
         await this.authorizationCodeRepository.insert({
             code,
@@ -29,6 +30,7 @@ let McpOAuthAuthorizationCodeService = class McpOAuthAuthorizationCodeService {
             codeChallenge,
             codeChallengeMethod: 'S256',
             state,
+            resource: resource ?? null,
             expiresAt: Date.now() + this.AUTHORIZATION_CODE_EXPIRY_MS,
             used: false,
         });
@@ -42,14 +44,32 @@ let McpOAuthAuthorizationCodeService = class McpOAuthAuthorizationCodeService {
             },
         });
         if (!authRecord) {
-            throw new Error('Invalid authorization code');
+            throw new errors_js_1.OAuthError('invalid_grant', 'Invalid authorization code');
         }
         if (authRecord.expiresAt < Date.now()) {
             await this.authorizationCodeRepository.remove(authRecord);
-            throw new Error('Authorization code expired');
+            throw new errors_js_1.OAuthError('invalid_grant', 'Authorization code expired');
         }
         return authRecord;
     }
+    async findAuthorizationCode(code, clientId, redirectUri) {
+        const authCode = await this.authorizationCodeRepository.findOne({
+            where: {
+                code,
+                clientId,
+                used: false,
+            },
+        });
+        if (!authCode)
+            return null;
+        if (authCode.expiresAt < Date.now()) {
+            await this.authorizationCodeRepository.remove(authCode);
+            return null;
+        }
+        if (redirectUri && authCode.redirectUri !== redirectUri)
+            return null;
+        return authCode;
+    }
     async validateAndConsumeAuthorizationCode(authorizationCode, clientId, redirectUri) {
         const authRecord = await this.findAndValidateAuthorizationCode(authorizationCode, clientId);
         if (redirectUri && authRecord.redirectUri !== redirectUri) {
@@ -58,13 +78,23 @@ let McpOAuthAuthorizationCodeService = class McpOAuthAuthorizationCodeService {
         const result = await this.authorizationCodeRepository.update({ code: authorizationCode, used: false }, { used: true });
         const numAffected = result.affected ?? 0;
         if (numAffected < 1) {
-            throw new Error('Authorization code already used');
+            throw new errors_js_1.OAuthError('invalid_grant', 'Authorization code already used');
         }
         authRecord.used = true;
         return authRecord;
     }
+    async markAuthorizationCodeAsUsed(authorizationCode) {
+        const result = await this.authorizationCodeRepository.update({ code: authorizationCode, used: false }, { used: true });
+        const numAffected = result.affected ?? 0;
+        if (numAffected < 1) {
+            throw new errors_js_1.OAuthError('invalid_grant', 'Authorization code already used');
+        }
+    }
     async getCodeChallenge(authorizationCode, clientId) {
-        const authRecord = await this.findAndValidateAuthorizationCode(authorizationCode, clientId);
+        const authRecord = await this.findAuthorizationCode(authorizationCode, clientId);
+        if (!authRecord) {
+            throw new errors_js_1.OAuthError('invalid_grant', 'Invalid authorization code');
+        }
         return authRecord.codeChallenge;
     }
 };

package/dist/modules/mcp/mcp-oauth-authorization-code.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"mcp-oauth-authorization-code.service.js","sourceRoot":"","sources":["../../../src/modules/mcp/mcp-oauth-authorization-code.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,8CAAsC;AACtC,gCAAkC;AAClC,6CAA0C;AAG1C,qHAA0G;AAOnG,IAAM,gCAAgC,GAAtC,MAAM,gCAAgC;IAG5C,YAA6B,2BAAwD;QAAxD,gCAA2B,GAA3B,2BAA2B,CAA6B;QAFpE,iCAA4B,GAAG,EAAE,GAAG,gBAAI,CAAC,OAAO,CAAC,cAAc,CAAC;IAEO,CAAC;IAMzF,KAAK,CAAC,uBAAuB,CAC5B,QAAgB,EAChB,MAAc,EACd,WAAmB,EACnB,aAAqB,EACrB,KAAoB;QAEpB,MAAM,IAAI,GAAG,IAAA,yBAAW,EAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QAE7C,MAAM,IAAI,CAAC,2BAA2B,CAAC,MAAM,CAAC;YAC7C,IAAI;YACJ,QAAQ;YACR,MAAM;YACN,WAAW;YACX,aAAa;YACb,mBAAmB,EAAE,MAAM;YAC3B,KAAK;YACL,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,4BAA4B;YACzD,IAAI,EAAE,KAAK;SACX,CAAC,CAAC;QAEH,OAAO,IAAI,CAAC;IACb,CAAC;IAMD,KAAK,CAAC,gCAAgC,CACrC,iBAAyB,EACzB,QAAgB;QAEhB,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,2BAA2B,CAAC,OAAO,CAAC;YACjE,KAAK,EAAE;gBACN,IAAI,EAAE,iBAAiB;gBACvB,QAAQ;aACR;SACD,CAAC,CAAC;QAEH,IAAI,CAAC,UAAU,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;QAC/C,CAAC;QAED,IAAI,UAAU,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC;YACvC,MAAM,IAAI,CAAC,2BAA2B,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;YAC1D,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;QAC/C,CAAC;QAED,OAAO,UAAU,CAAC;IACnB,CAAC;IAMD,KAAK,CAAC,mCAAmC,CACxC,iBAAyB,EACzB,QAAgB,EAChB,WAAoB;QAEpB,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,gCAAgC,CAAC,iBAAiB,EAAE,QAAQ,CAAC,CAAC;QAE5F,IAAI,WAAW,IAAI,UAAU,CAAC,WAAW,KAAK,WAAW,EAAE,CAAC;YAC3D,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;QAC1C,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,2BAA2B,CAAC,MAAM,CAC3D,EAAE,IAAI,EAAE,iBAAiB,EAAE,IAAI,EAAE,KAAK,EAAE,EACxC,EAAE,IAAI,EAAE,IAAI,EAAE,CACd,CAAC;QAEF,MAAM,WAAW,GAAG,MAAM,CAAC,QAAQ,IAAI,CAAC,CAAC;QACzC,IAAI,WAAW,GAAG,CAAC,EAAE,CAAC;YACrB,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;QACpD,CAAC;QAED,UAAU,CAAC,IAAI,GAAG,IAAI,CAAC;QACvB,OAAO,UAAU,CAAC;IACnB,CAAC;IAMD,KAAK,CAAC,gBAAgB,CAAC,iBAAyB,EAAE,QAAgB;QACjE,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,gCAAgC,CAAC,iBAAiB,EAAE,QAAQ,CAAC,CAAC;QAC5F,OAAO,UAAU,CAAC,aAAa,CAAC;IACjC,CAAC;CACD,CAAA;AAjGY,4EAAgC;2CAAhC,gCAAgC;IAD5C,IAAA,YAAO,GAAE;qCAIiD,iEAA2B;GAHzE,gCAAgC,CAiG5C"}
+{"version":3,"file":"mcp-oauth-authorization-code.service.js","sourceRoot":"","sources":["../../../src/modules/mcp/mcp-oauth-authorization-code.service.ts"],"names":[],"mappings":"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"}

package/dist/modules/mcp/mcp-oauth-consent.service.js

@@ -66,7 +66,7 @@ let McpOAuthConsentService = class McpOAuthConsentService {
             clientId: sessionPayload.clientId,
             grantedAt: Date.now(),
         }, ['userId', 'clientId']);
-        const code = await this.authorizationCodeService.createAuthorizationCode(sessionPayload.clientId, userId, sessionPayload.redirectUri, sessionPayload.codeChallenge, sessionPayload.state);
+        const code = await this.authorizationCodeService.createAuthorizationCode(sessionPayload.clientId, userId, sessionPayload.redirectUri, sessionPayload.codeChallenge, sessionPayload.state, sessionPayload.resource);
         const successRedirectUrl = mcp_oauth_helpers_1.McpOAuthHelpers.buildSuccessRedirectUrl(sessionPayload.redirectUri, code, sessionPayload.state);
         this.logger.info('Consent approved', {
             clientId: sessionPayload.clientId,

package/dist/modules/mcp/mcp-oauth-consent.service.js.map

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