n8n 2.34.3 → 2.35.0

package/dist/modules/n8n-packages/entities/variable/variable.exporter.js

@@ -13,6 +13,7 @@ exports.VariableExporter = void 0;
 const db_1 = require("@n8n/db");
 const di_1 = require("@n8n/di");
 const n8n_workflow_1 = require("n8n-workflow");
+const zod_1 = require("zod");
 const variables_service_ee_1 = require("../../../../environments.ee/variables/variables.service.ee");
 const variable_serializer_1 = require("./variable.serializer");
 const unique_filename_allocator_1 = require("../../io/unique-filename-allocator");
@@ -52,42 +53,36 @@ let VariableExporter = class VariableExporter {
         const bundledVariableIds = new Set();
         const requirements = [];
         for (const { name, usedByWorkflows, variables } of resolvedNames) {
-            let aggregateValue;
-            let everyWorkflowResolvedToSameValue = true;
             for (const variable of variables) {
-                if (!isBundleableVariable(variable)) {
-                    everyWorkflowResolvedToSameValue = false;
+                if (!isBundleableVariable(variable))
                     continue;
-                }
-                if (aggregateValue === undefined) {
-                    aggregateValue = variable.value;
-                }
-                else if (aggregateValue !== variable.value) {
-                    everyWorkflowResolvedToSameValue = false;
-                }
                 if (bundledVariableIds.has(variable.id))
                     continue;
                 bundledVariableIds.add(variable.id);
                 const baseDir = this.resolveBaseDir(variable, request.projectTargetsById);
                 const target = allocatorFor(baseDir).allocate(variable.key);
                 request.writer.writeDirectory(target);
-                request.writer.writeFile(`${target}/variable.json`, JSON.stringify(this.variableSerializer.serialize(variable, {
-                    includeValue: request.includeVariableValues,
-                }), null, '\t'));
+                request.writer.writeFile(`${target}/variable.json`, JSON.stringify(this.serializeOrBlock(variable, request.includeVariableValues), null, '\t'));
                 entries.push({ id: variable.id, name: variable.key, target });
             }
-            requirements.push({
-                name,
-                ...(request.includeVariableValues &&
-                    everyWorkflowResolvedToSameValue &&
-                    aggregateValue !== undefined
-                    ? { value: aggregateValue }
-                    : {}),
-                usedByWorkflows,
-            });
+            requirements.push({ name, usedByWorkflows });
         }
         return { entries, requirements };
     }
+    serializeOrBlock(variable, includeValue) {
+        try {
+            return this.variableSerializer.serialize(variable, { includeValue });
+        }
+        catch (error) {
+            if (!(error instanceof zod_1.ZodError))
+                throw error;
+            throw new package_export_errors_1.PackageExportBlockedError(`Variable "${variable.key}" does not match the expected format. Export aborted.`, {
+                description: `${error.issues
+                    .map((issue) => issue.message)
+                    .join('; ')}. Fix the variable and retry the export.`,
+            });
+        }
+    }
     resolveRequirements(requirements, projectIdByWorkflowId, allVariables, accessibleIds) {
         const variablesByKey = new Map();
         for (const variable of allVariables) {

package/dist/modules/n8n-packages/entities/variable/variable.exporter.js.map

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

package/dist/modules/n8n-packages/entities/variable/variable.types.d.ts

@@ -1,8 +1,8 @@
 import type { User } from '@n8n/db';
 import type { PackageWriter } from '../../io/package-writer';
+import type { VariableConflictPolicy, VariableMissingMode } from '../../n8n-packages.types';
 import type { ManifestEntry } from '../../spec/manifest.schema';
 import type { PackageVariableRequirement } from '../../spec/requirements.schema';
-import type { VariableMissingMode } from '../../n8n-packages.types';
 export interface WorkflowVariableRequirement {
     workflowId: string;
     variableName: string;
@@ -20,10 +20,12 @@ export interface VariableExportResult {
 }
 export type PlacedVariableRequirement = PackageVariableRequirement & {
     globalPlacement: boolean;
+    packageValue?: string;
 };
 export interface VariableImportRequest {
     requirements: PlacedVariableRequirement[] | undefined;
     missingMode: VariableMissingMode;
+    conflictPolicy: VariableConflictPolicy;
 }
 export interface VariableResolutionFailure {
     name: string;
@@ -32,6 +34,19 @@ export interface VariableResolutionFailure {
 export interface VariableCreation {
     name: string;
     projectId?: string;
+    value?: string;
+    usedByWorkflows: string[];
+}
+export interface VariableConflict {
+    name: string;
+    projectId?: string;
+    usedByWorkflows: string[];
+}
+export interface VariableOverwrite {
+    variableId: string;
+    name: string;
+    projectId?: string;
+    value: string;
     usedByWorkflows: string[];
 }
 export interface VariableLimitFailure {
@@ -47,6 +62,7 @@ export declare function destinationKey(destination: {
     projectId?: string;
 }): string;
 export declare function dedupeCreationsByDestination(creations: VariableCreation[]): VariableCreation[];
+export declare function divergentOverwrites(overwrites: VariableOverwrite[]): VariableConflict[];
 export declare function computeVariableLimitFailure(creations: VariableCreation[], quota: {
     limit: number;
     remaining: number;
@@ -55,9 +71,12 @@ export interface VariableImportPlan {
     matched: string[];
     missing: VariableResolutionFailure[];
     creations: VariableCreation[];
+    conflicts: VariableConflict[];
+    overwrites: VariableOverwrite[];
 }
 export interface VariableApplyResult {
+    created: string[];
     stubbed: string[];
     skippedExisting: string[];
-    createdCount: number;
+    updated: string[];
 }

package/dist/modules/n8n-packages/entities/variable/variable.types.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createFailure = createFailure;
 exports.destinationKey = destinationKey;
 exports.dedupeCreationsByDestination = dedupeCreationsByDestination;
+exports.divergentOverwrites = divergentOverwrites;
 exports.computeVariableLimitFailure = computeVariableLimitFailure;
 function createFailure(requirement) {
     return {
@@ -30,6 +31,20 @@ function dedupeCreationsByDestination(creations) {
     }
     return [...byDestination.values()];
 }
+function divergentOverwrites(overwrites) {
+    const firstValueByRow = new Map();
+    const divergent = new Set();
+    for (const { variableId, value } of overwrites) {
+        const seen = firstValueByRow.get(variableId);
+        if (seen === undefined)
+            firstValueByRow.set(variableId, value);
+        else if (seen !== value)
+            divergent.add(variableId);
+    }
+    return overwrites
+        .filter(({ variableId }) => divergent.has(variableId))
+        .map(({ variableId, value, ...conflict }) => conflict);
+}
 function computeVariableLimitFailure(creations, quota) {
     if (quota === null || creations.length === 0)
         return undefined;

package/dist/modules/n8n-packages/entities/variable/variable.types.js.map

@@ -1 +1 @@
-{"version":3,"file":"variable.types.js","sourceRoot":"","sources":["../../../../../src/modules/n8n-packages/entities/variable/variable.types.ts"],"names":[],"mappings":";;;;;;AAsDA,uBAA8B,WAAuC;IACpE,OAAO;QACN,IAAI,EAAE,WAAW,CAAC,IAAI;QACtB,eAAe,EAAE,CAAC,GAAG,IAAI,GAAG,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC,CAAC,IAAI,EAAE;KACjE,CAAC;AACH,CAAC;AAED,wBAA+B,WAAiD;IAC/E,OAAO,WAAW,CAAC,SAAS;QAC3B,CAAC,CAAC,WAAW,WAAW,CAAC,SAAS,IAAI,WAAW,CAAC,IAAI,EAAE;QACxD,CAAC,CAAC,UAAU,WAAW,CAAC,IAAI,EAAE,CAAC;AACjC,CAAC;AAED,sCAA6C,SAA6B;IACzE,MAAM,aAAa,GAAG,IAAI,GAAG,EAA4B,CAAC;IAC1D,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;QAClC,MAAM,GAAG,GAAG,cAAc,CAAC,QAAQ,CAAC,CAAC;QACrC,MAAM,QAAQ,GAAG,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACxC,IAAI,CAAC,QAAQ,EAAE,CAAC;YAEf,aAAa,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,GAAG,QAAQ,EAAE,eAAe,EAAE,CAAC,GAAG,QAAQ,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;YACxF,SAAS;QACV,CAAC;QACD,QAAQ,CAAC,eAAe,GAAG;YAC1B,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,QAAQ,CAAC,eAAe,EAAE,GAAG,QAAQ,CAAC,eAAe,CAAC,CAAC;SACtE,CAAC,IAAI,EAAE,CAAC;IACV,CAAC;IACD,OAAO,CAAC,GAAG,aAAa,CAAC,MAAM,EAAE,CAAC,CAAC;AACpC,CAAC;AAGD,qCACC,SAA6B,EAC7B,KAAkD;IAElD,IAAI,KAAK,KAAK,IAAI,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,SAAS,CAAC;IAC/D,IAAI,SAAS,CAAC,MAAM,IAAI,KAAK,CAAC,SAAS;QAAE,OAAO,SAAS,CAAC;IAC1D,OAAO;QACN,KAAK,EAAE,KAAK,CAAC,KAAK;QAClB,SAAS,EAAE,KAAK,CAAC,SAAS;QAC1B,SAAS,EAAE,SAAS,CAAC,MAAM;QAC3B,KAAK,EAAE,CAAC,GAAG,IAAI,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE;QACtE,eAAe,EAAE,CAAC,GAAG,IAAI,GAAG,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE;KAC/F,CAAC;AACH,CAAC"}
+{"version":3,"file":"variable.types.js","sourceRoot":"","sources":["../../../../../src/modules/n8n-packages/entities/variable/variable.types.ts"],"names":[],"mappings":"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"}

package/dist/modules/n8n-packages/entities/workflow/workflow-publisher.d.ts

@@ -2,6 +2,7 @@ import { Logger } from '@n8n/backend-common';
 import type { User, WorkflowEntity } from '@n8n/db';
 import { ProjectRepository } from '@n8n/db';
 import { ProjectService } from '../../../../services/project.service.ee';
+import { WebhookService } from '../../../../webhooks/webhook.service';
 import { WorkflowService } from '../../../../workflows/workflow.service';
 import type { PersistedWorkflowOutcome, PersistedWorkflowPlanItem } from './workflow-import.types';
 import { WorkflowPublishingPolicy, type WorkflowPublishingBlockedReason, type WorkflowPublishingOutcome } from './workflow-publishing-policy.types';
@@ -22,8 +23,11 @@ export declare class WorkflowPublisher {
     private readonly projectRepository;
     private readonly projectService;
     private readonly workflowService;
-    constructor(logger: Logger, projectRepository: ProjectRepository, projectService: ProjectService, workflowService: WorkflowService);
+    private readonly webhookService;
+    constructor(logger: Logger, projectRepository: ProjectRepository, projectService: ProjectService, workflowService: WorkflowService, webhookService: WebhookService);
     applyToPackage({ user, persisted, policy, subWorkflowRequirements, }: PackagePublishingRequest): Promise<PackagePublishingResults>;
+    private webhookKeysOnPublish;
     assertCanPublish(user: User, projectId: string, policy: WorkflowPublishingPolicy, projectPendingCreation?: boolean): Promise<void>;
-    apply(user: User, item: PersistedWorkflowPlanItem, workflow: WorkflowEntity, policy: WorkflowPublishingPolicy, blockedReason?: WorkflowPublishingBlockedReason): Promise<WorkflowPublishingResult>;
+    apply(user: User, item: PersistedWorkflowPlanItem, workflow: WorkflowEntity, policy: WorkflowPublishingPolicy, blockedReason?: WorkflowPublishingBlockedReason, webhookContested?: boolean): Promise<WorkflowPublishingResult>;
+    private failed;
 }

package/dist/modules/n8n-packages/entities/workflow/workflow-publisher.js

@@ -17,23 +17,32 @@ const ensure_error_1 = require("@n8n/utils/errors/ensure-error");
 const forbidden_error_1 = require("../../../../errors/response-errors/forbidden.error");
 const not_found_error_1 = require("../../../../errors/response-errors/not-found.error");
 const project_service_ee_1 = require("../../../../services/project.service.ee");
+const constants_1 = require("../../../../webhooks/constants");
+const webhook_service_1 = require("../../../../webhooks/webhook.service");
 const workflow_service_1 = require("../../../../workflows/workflow.service");
 const sub_workflow_ordering_1 = require("./sub-workflow-ordering");
 const workflow_publishing_policy_1 = require("./workflow-publishing-policy");
 const workflow_publishing_policy_types_1 = require("./workflow-publishing-policy.types");
 let WorkflowPublisher = class WorkflowPublisher {
-    constructor(logger, projectRepository, projectService, workflowService) {
+    constructor(logger, projectRepository, projectService, workflowService, webhookService) {
         this.logger = logger;
         this.projectRepository = projectRepository;
         this.projectService = projectService;
         this.workflowService = workflowService;
+        this.webhookService = webhookService;
     }
     async applyToPackage({ user, persisted, policy, subWorkflowRequirements, }) {
         const results = new Map();
+        const claimedPaths = new Set();
         for (const outcome of (0, sub_workflow_ordering_1.orderBySubWorkflowDependencies)(persisted, subWorkflowRequirements)) {
             if (outcome.status === 'skipped')
                 continue;
-            const result = await this.apply(user, outcome.item, outcome.workflow, policy, outcome.blockedFromPublish);
+            const webhookKeys = this.webhookKeysOnPublish(outcome, policy);
+            const result = await this.apply(user, outcome.item, outcome.workflow, policy, outcome.blockedFromPublish, webhookKeys.some((key) => claimedPaths.has(key)));
+            if (result.publishing.state === 'published') {
+                for (const key of webhookKeys)
+                    claimedPaths.add(key);
+            }
             result.workflow.parentFolder =
                 result.workflow.parentFolder ??
                     outcome.workflow.parentFolder ??
@@ -43,6 +52,14 @@ let WorkflowPublisher = class WorkflowPublisher {
         }
         return results;
     }
+    webhookKeysOnPublish(outcome, policy) {
+        if (outcome.blockedFromPublish)
+            return [];
+        const action = (0, workflow_publishing_policy_1.decideWorkflowPublishingAction)(policy, toPublishingContext(outcome.item, outcome.workflow));
+        if (action !== 'publish')
+            return [];
+        return this.webhookService.getStaticWebhookKeys(outcome.workflow.nodes);
+    }
     async assertCanPublish(user, projectId, policy, projectPendingCreation = false) {
         if (policy !== workflow_publishing_policy_types_1.WorkflowPublishingPolicy.PublishAll) {
             return;
@@ -61,7 +78,7 @@ let WorkflowPublisher = class WorkflowPublisher {
         }
         throw new forbidden_error_1.ForbiddenError('You do not have permission to publish workflows in this project.');
     }
-    async apply(user, item, workflow, policy, blockedReason) {
+    async apply(user, item, workflow, policy, blockedReason, webhookContested = false) {
         const action = (0, workflow_publishing_policy_1.decideWorkflowPublishingAction)(policy, toPublishingContext(item, workflow));
         if (action === 'noop') {
             return { workflow, publishing: { state: 'unchanged' } };
@@ -81,6 +98,9 @@ let WorkflowPublisher = class WorkflowPublisher {
                 publishing: { state: 'blocked', blockedReason },
             };
         }
+        if (action === 'publish' && webhookContested) {
+            return this.failed(workflow, action, constants_1.WEBHOOK_CONFLICT_MESSAGE);
+        }
         try {
             if (action === 'publish') {
                 return {
@@ -99,20 +119,22 @@ let WorkflowPublisher = class WorkflowPublisher {
             };
         }
         catch (error) {
-            const message = (0, ensure_error_1.ensureError)(error).message;
-            this.logger.warn('Failed to apply publishing policy to imported workflow', {
-                workflowId: workflow.id,
-                action,
-                error: message,
-            });
-            return { workflow, publishing: { state: 'failed', error: message } };
+            return this.failed(workflow, action, (0, ensure_error_1.ensureError)(error).message);
         }
     }
+    failed(workflow, action, error) {
+        this.logger.warn('Failed to apply publishing policy to imported workflow', {
+            workflowId: workflow.id,
+            action,
+            error,
+        });
+        return { workflow, publishing: { state: 'failed', error } };
+    }
 };
 exports.WorkflowPublisher = WorkflowPublisher;
 exports.WorkflowPublisher = WorkflowPublisher = __decorate([
     (0, di_1.Service)(),
-    __metadata("design:paramtypes", [backend_common_1.Logger, db_1.ProjectRepository, project_service_ee_1.ProjectService, workflow_service_1.WorkflowService])
+    __metadata("design:paramtypes", [backend_common_1.Logger, db_1.ProjectRepository, project_service_ee_1.ProjectService, workflow_service_1.WorkflowService, webhook_service_1.WebhookService])
 ], WorkflowPublisher);
 function toPublishingContext(item, workflow) {
     return {

package/dist/modules/n8n-packages/entities/workflow/workflow-publisher.js.map

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

package/dist/modules/n8n-packages/n8n-packages.types.d.ts

@@ -2,7 +2,7 @@ import type { User } from '@n8n/db';
 import type { Readable } from 'node:stream';
 import type { DataTableResolutionFailure } from './entities/data-table/data-table.types';
 import type { TagResolutionFailure } from './entities/tag/tag.types';
-import type { VariableLimitFailure, VariableResolutionFailure } from './entities/variable/variable.types';
+import type { VariableConflict, VariableLimitFailure, VariableResolutionFailure } from './entities/variable/variable.types';
 import type { WorkflowIdConflict } from './entities/workflow/workflow-import-match.service';
 import type { WorkflowConflict, WorkflowFolderConflict } from './entities/workflow/workflow-import.types';
 import type { WorkflowPublishingOutcome, WorkflowPublishingPolicy } from './entities/workflow/workflow-publishing-policy.types';
@@ -21,6 +21,11 @@ export declare const WorkflowIdPolicy: {
     readonly New: 'new';
     readonly Source: 'source';
 };
+export declare const ProjectConflictPolicy: {
+    readonly Merge: 'merge';
+    readonly Fail: 'fail';
+    readonly Overwrite: 'overwrite';
+};
 export declare const FolderConflictPolicy: {
     readonly Merge: 'merge';
     readonly Fail: 'fail';
@@ -50,6 +55,12 @@ export declare const VariableMissingMode: {
     readonly DoNothing: 'do-nothing';
     readonly MustPreexist: 'must-preexist';
     readonly CreateStub: 'create-stub';
+    readonly CreateWithValue: 'create-with-value';
+};
+export declare const VariableConflictPolicy: {
+    readonly KeepExisting: 'keep-existing';
+    readonly Overwrite: 'overwrite';
+    readonly Fail: 'fail';
 };
 export declare const VariableParentPolicy: {
     readonly Project: 'project';
@@ -66,6 +77,7 @@ export declare const TagConflictPolicy: {
 };
 export type WorkflowConflictPolicy = (typeof WorkflowConflictPolicy)[keyof typeof WorkflowConflictPolicy];
 export type WorkflowIdPolicy = (typeof WorkflowIdPolicy)[keyof typeof WorkflowIdPolicy];
+export type ProjectConflictPolicy = (typeof ProjectConflictPolicy)[keyof typeof ProjectConflictPolicy];
 export type FolderConflictPolicy = (typeof FolderConflictPolicy)[keyof typeof FolderConflictPolicy];
 export type MissingNodeTypeMode = (typeof MissingNodeTypeMode)[keyof typeof MissingNodeTypeMode];
 export type MissingWorkflowDependencyPolicy = (typeof MissingWorkflowDependencyPolicy)[keyof typeof MissingWorkflowDependencyPolicy];
@@ -73,6 +85,7 @@ export type DataTableMatchingMode = (typeof DataTableMatchingMode)[keyof typeof
 export type DataTableMissingMode = (typeof DataTableMissingMode)[keyof typeof DataTableMissingMode];
 export type DataTableSchemaConflictPolicy = (typeof DataTableSchemaConflictPolicy)[keyof typeof DataTableSchemaConflictPolicy];
 export type VariableMissingMode = (typeof VariableMissingMode)[keyof typeof VariableMissingMode];
+export type VariableConflictPolicy = (typeof VariableConflictPolicy)[keyof typeof VariableConflictPolicy];
 export type VariableParentPolicy = (typeof VariableParentPolicy)[keyof typeof VariableParentPolicy];
 export type TagMissingMode = (typeof TagMissingMode)[keyof typeof TagMissingMode];
 export type TagConflictPolicy = (typeof TagConflictPolicy)[keyof typeof TagConflictPolicy];
@@ -93,7 +106,7 @@ export type ImportPackageRequest = {
     packageBuffer: Buffer;
     bindings?: Partial<PackageImportBindings>;
     apiKeyScopes?: string[];
-} & ImportCredentialProperties & ImportWorkflowProperties & ImportFolderProperties & ImportDataTableProperties & ImportVariableProperties & ImportTagProperties;
+} & ImportCredentialProperties & ImportWorkflowProperties & ImportProjectProperties & ImportFolderProperties & ImportDataTableProperties & ImportVariableProperties & ImportTagProperties;
 export type ImportCredentialProperties = {
     credentialMatchingMode: CredentialMatchingMode;
     credentialMissingMode: CredentialMissingMode;
@@ -104,6 +117,9 @@ export type ImportWorkflowProperties = {
     workflowIdPolicy: WorkflowIdPolicy;
     missingNodeTypeMode: MissingNodeTypeMode;
 };
+export type ImportProjectProperties = {
+    projectConflictPolicy: ProjectConflictPolicy;
+};
 export type ImportFolderProperties = {
     folderConflictPolicy: FolderConflictPolicy;
 };
@@ -114,6 +130,7 @@ export type ImportDataTableProperties = {
 };
 export type ImportVariableProperties = {
     variableMissingMode: VariableMissingMode;
+    variableConflictPolicy: VariableConflictPolicy;
     variableParentPolicy?: VariableParentPolicy;
 };
 export type ImportTagProperties = {
@@ -151,12 +168,15 @@ export type ImportPackageEventCounts = {
         matched: number;
         missing: number;
         created: number;
+        stubbed: number;
+        updated: number;
         requirements: number;
     };
     tags: {
         matched: number;
         created: number;
         renamed: number;
+        reconciled: number;
         skipped: number;
         requirements: number;
     };
@@ -194,7 +214,7 @@ export interface ImportedProjectSummary {
     sourceProjectId: string;
     localId: string;
     name: string;
-    status: 'created' | 'updated';
+    status: 'created' | 'updated' | 'skipped';
 }
 export type BlockingIssue = ({
     type: 'workflow-conflict';
@@ -211,6 +231,8 @@ export type BlockingIssue = ({
     actualType?: string;
     usedByWorkflows: string[];
 } | ({
+    type: 'project-conflict';
+} & ProjectConflict) | ({
     type: 'folder-conflict';
 } & FolderConflict) | ({
     type: 'data-table-unresolved';
@@ -219,6 +241,8 @@ export type BlockingIssue = ({
 } & TagResolutionFailure) | ({
     type: 'variable-unresolved';
 } & VariableResolutionFailure) | ({
+    type: 'variable-conflict';
+} & VariableConflict) | ({
     type: 'variable-limit-exceeded';
 } & VariableLimitFailure) | {
     type: 'missing-node-type';
@@ -226,6 +250,11 @@ export type BlockingIssue = ({
     typeVersion: number;
     usedByWorkflows: string[];
 };
+export interface ProjectConflict {
+    kind: 'fail-policy';
+    sourceProjectId: string;
+    name: string;
+}
 export interface FolderConflict {
     kind: 'parent-mismatch' | 'id-in-other-project' | 'fail-policy';
     sourceFolderId: string;
@@ -255,12 +284,15 @@ export interface ImportCredentialSummary {
 export interface ImportVariableSummary {
     matched: string[];
     missing: string[];
+    created: string[];
     stubbed: string[];
+    updated: string[];
 }
 export interface ImportTagSummary {
     matched: string[];
     created: string[];
     renamed: string[];
+    reconciled: string[];
     skipped: string[];
 }
 export interface ImportResult {

package/dist/modules/n8n-packages/n8n-packages.types.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TagConflictPolicy = exports.TagMissingMode = exports.VariableParentPolicy = exports.VariableMissingMode = exports.DataTableSchemaConflictPolicy = exports.DataTableMissingMode = exports.DataTableMatchingMode = exports.MissingWorkflowDependencyPolicy = exports.MissingNodeTypeMode = exports.FolderConflictPolicy = exports.WorkflowIdPolicy = exports.WorkflowConflictPolicy = exports.WorkflowPublishingPolicy = void 0;
+exports.TagConflictPolicy = exports.TagMissingMode = exports.VariableParentPolicy = exports.VariableConflictPolicy = exports.VariableMissingMode = exports.DataTableSchemaConflictPolicy = exports.DataTableMissingMode = exports.DataTableMatchingMode = exports.MissingWorkflowDependencyPolicy = exports.MissingNodeTypeMode = exports.FolderConflictPolicy = exports.ProjectConflictPolicy = exports.WorkflowIdPolicy = exports.WorkflowConflictPolicy = exports.WorkflowPublishingPolicy = void 0;
 exports.createBindings = createBindings;
 exports.mergeBindings = mergeBindings;
 exports.serializeBindings = serializeBindings;
@@ -15,6 +15,11 @@ exports.WorkflowIdPolicy = {
     New: 'new',
     Source: 'source',
 };
+exports.ProjectConflictPolicy = {
+    Merge: 'merge',
+    Fail: 'fail',
+    Overwrite: 'overwrite',
+};
 exports.FolderConflictPolicy = {
     Merge: 'merge',
     Fail: 'fail',
@@ -44,6 +49,12 @@ exports.VariableMissingMode = {
     DoNothing: 'do-nothing',
     MustPreexist: 'must-preexist',
     CreateStub: 'create-stub',
+    CreateWithValue: 'create-with-value',
+};
+exports.VariableConflictPolicy = {
+    KeepExisting: 'keep-existing',
+    Overwrite: 'overwrite',
+    Fail: 'fail',
 };
 exports.VariableParentPolicy = {
     Project: 'project',

package/dist/modules/n8n-packages/n8n-packages.types.js.map

@@ -1 +1 @@
-{"version":3,"file":"n8n-packages.types.js","sourceRoot":"","sources":["../../../src/modules/n8n-packages/n8n-packages.types.ts"],"names":[],"mappings":";;;;;;AAoBA,yGAAgG;AAAvF,4IAAA,wBAAwB,OAAA;AASpB,QAAA,sBAAsB,GAAG;IAErC,UAAU,EAAE,aAAa;IAEzB,IAAI,EAAE,MAAM;IAEZ,IAAI,EAAE,MAAM;CACH,CAAC;AAEE,QAAA,gBAAgB,GAAG;IAE/B,GAAG,EAAE,KAAK;IAEV,MAAM,EAAE,QAAQ;CACP,CAAC;AAEE,QAAA,oBAAoB,GAAG;IAEnC,KAAK,EAAE,OAAO;IAEd,IAAI,EAAE,MAAM;CACH,CAAC;AAEE,QAAA,mBAAmB,GAAG;IAElC,IAAI,EAAE,MAAM;IAEZ,YAAY,EAAE,eAAe;CACpB,CAAC;AAEE,QAAA,+BAA+B,GAAG;IAE9C,IAAI,EAAE,MAAM;IAEZ,aAAa,EAAE,gBAAgB;IAE/B,gBAAgB,EAAE,oBAAoB;CAC7B,CAAC;AAEE,QAAA,qBAAqB,GAAG;IAEpC,IAAI,EAAE,OAAO;CACJ,CAAC;AAEE,QAAA,oBAAoB,GAAG;IAEnC,MAAM,EAAE,QAAQ;IAEhB,YAAY,EAAE,eAAe;IAE7B,SAAS,EAAE,YAAY;CACd,CAAC;AAEE,QAAA,6BAA6B,GAAG;IAE5C,YAAY,EAAE,eAAe;IAE7B,IAAI,EAAE,MAAM;CACH,CAAC;AAEE,QAAA,mBAAmB,GAAG;IAElC,SAAS,EAAE,YAAY;IAEvB,YAAY,EAAE,eAAe;IAE7B,UAAU,EAAE,aAAa;CAChB,CAAC;AAEE,QAAA,oBAAoB,GAAG;IACnC,OAAO,EAAE,SAAS;IAClB,MAAM,EAAE,QAAQ;CACP,CAAC;AAEE,QAAA,cAAc,GAAG;IAE7B,MAAM,EAAE,QAAQ;IAEhB,SAAS,EAAE,YAAY;CACd,CAAC;AAEE,QAAA,iBAAiB,GAAG;IAEhC,IAAI,EAAE,MAAM;IAEZ,IAAI,EAAE,MAAM;IAEZ,MAAM,EAAE,QAAQ;CACP,CAAC;AA+PX,wBAA+B,IAAI,GAAmC,EAAE;IACvE,OAAO;QACN,SAAS,EAAE,IAAI,GAAG,EAAE;QACpB,WAAW,EAAE,IAAI,GAAG,EAAE;QACtB,GAAG,IAAI;KACP,CAAC;AACH,CAAC;AAGD,uBAA8B,GAAG,QAAiC;IACjE,OAAO;QACN,SAAS,EAAE,IAAI,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC;QACvE,WAAW,EAAE,IAAI,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC;KAC7E,CAAC;AACH,CAAC;AAMD,2BAAkC,QAA+B;IAChE,OAAO;QACN,SAAS,EAAE,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,SAAS,CAAC;QACjD,WAAW,EAAE,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,WAAW,CAAC;KACrD,CAAC;AACH,CAAC"}
+{"version":3,"file":"n8n-packages.types.js","sourceRoot":"","sources":["../../../src/modules/n8n-packages/n8n-packages.types.ts"],"names":[],"mappings":";;;;;;AAqBA,yGAAgG;AAAvF,4IAAA,wBAAwB,OAAA;AASpB,QAAA,sBAAsB,GAAG;IAErC,UAAU,EAAE,aAAa;IAEzB,IAAI,EAAE,MAAM;IAEZ,IAAI,EAAE,MAAM;CACH,CAAC;AAEE,QAAA,gBAAgB,GAAG;IAE/B,GAAG,EAAE,KAAK;IAEV,MAAM,EAAE,QAAQ;CACP,CAAC;AAEE,QAAA,qBAAqB,GAAG;IAEpC,KAAK,EAAE,OAAO;IAEd,IAAI,EAAE,MAAM;IAMZ,SAAS,EAAE,WAAW;CACb,CAAC;AAEE,QAAA,oBAAoB,GAAG;IAEnC,KAAK,EAAE,OAAO;IAEd,IAAI,EAAE,MAAM;CACH,CAAC;AAEE,QAAA,mBAAmB,GAAG;IAElC,IAAI,EAAE,MAAM;IAEZ,YAAY,EAAE,eAAe;CACpB,CAAC;AAEE,QAAA,+BAA+B,GAAG;IAE9C,IAAI,EAAE,MAAM;IAEZ,aAAa,EAAE,gBAAgB;IAE/B,gBAAgB,EAAE,oBAAoB;CAC7B,CAAC;AAEE,QAAA,qBAAqB,GAAG;IAEpC,IAAI,EAAE,OAAO;CACJ,CAAC;AAEE,QAAA,oBAAoB,GAAG;IAEnC,MAAM,EAAE,QAAQ;IAEhB,YAAY,EAAE,eAAe;IAE7B,SAAS,EAAE,YAAY;CACd,CAAC;AAEE,QAAA,6BAA6B,GAAG;IAE5C,YAAY,EAAE,eAAe;IAE7B,IAAI,EAAE,MAAM;CACH,CAAC;AAEE,QAAA,mBAAmB,GAAG;IAElC,SAAS,EAAE,YAAY;IAEvB,YAAY,EAAE,eAAe;IAE7B,UAAU,EAAE,aAAa;IAEzB,eAAe,EAAE,mBAAmB;CAC3B,CAAC;AAEE,QAAA,sBAAsB,GAAG;IAErC,YAAY,EAAE,eAAe;IAE7B,SAAS,EAAE,WAAW;IAEtB,IAAI,EAAE,MAAM;CACH,CAAC;AAEE,QAAA,oBAAoB,GAAG;IACnC,OAAO,EAAE,SAAS;IAClB,MAAM,EAAE,QAAQ;CACP,CAAC;AAEE,QAAA,cAAc,GAAG;IAE7B,MAAM,EAAE,QAAQ;IAEhB,SAAS,EAAE,YAAY;CACd,CAAC;AAEE,QAAA,iBAAiB,GAAG;IAEhC,IAAI,EAAE,MAAM;IAEZ,IAAI,EAAE,MAAM;IAEZ,MAAM,EAAE,QAAQ;CACP,CAAC;AAwRX,wBAA+B,IAAI,GAAmC,EAAE;IACvE,OAAO;QACN,SAAS,EAAE,IAAI,GAAG,EAAE;QACpB,WAAW,EAAE,IAAI,GAAG,EAAE;QACtB,GAAG,IAAI;KACP,CAAC;AACH,CAAC;AAGD,uBAA8B,GAAG,QAAiC;IACjE,OAAO;QACN,SAAS,EAAE,IAAI,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC;QACvE,WAAW,EAAE,IAAI,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC;KAC7E,CAAC;AACH,CAAC;AAMD,2BAAkC,QAA+B;IAChE,OAAO;QACN,SAAS,EAAE,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,SAAS,CAAC;QACjD,WAAW,EAAE,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,WAAW,CAAC;KACrD,CAAC;AACH,CAAC"}

package/dist/modules/n8n-packages/spec/manifest.schema.d.ts

@@ -179,23 +179,18 @@ export declare const packageManifestSchema: z.ZodEffects<z.ZodObject<{
         }[] | undefined>;
         variables: z.ZodEffects<z.ZodOptional<z.ZodArray<z.ZodObject<{
             name: z.ZodString;
-            value: z.ZodOptional<z.ZodString>;
             usedByWorkflows: z.ZodArray<z.ZodString, "many">;
         }, "strip", z.ZodTypeAny, {
             name: string;
-            value?: string | undefined;
             usedByWorkflows: string[];
         }, {
             name: string;
-            value?: string | undefined;
             usedByWorkflows: string[];
         }>, "many">>, {
             name: string;
-            value?: string | undefined;
             usedByWorkflows: string[];
         }[] | undefined, {
             name: string;
-            value?: string | undefined;
             usedByWorkflows: string[];
         }[] | undefined>;
         tags: z.ZodEffects<z.ZodOptional<z.ZodArray<z.ZodObject<{
@@ -259,7 +254,6 @@ export declare const packageManifestSchema: z.ZodEffects<z.ZodObject<{
         }[] | undefined;
         variables?: {
             name: string;
-            value?: string | undefined;
             usedByWorkflows: string[];
         }[] | undefined;
         tags?: {
@@ -291,7 +285,6 @@ export declare const packageManifestSchema: z.ZodEffects<z.ZodObject<{
         }[] | undefined;
         variables?: {
             name: string;
-            value?: string | undefined;
             usedByWorkflows: string[];
         }[] | undefined;
         tags?: {
@@ -364,7 +357,6 @@ export declare const packageManifestSchema: z.ZodEffects<z.ZodObject<{
         }[] | undefined;
         variables?: {
             name: string;
-            value?: string | undefined;
             usedByWorkflows: string[];
         }[] | undefined;
         tags?: {
@@ -437,7 +429,6 @@ export declare const packageManifestSchema: z.ZodEffects<z.ZodObject<{
         }[] | undefined;
         variables?: {
             name: string;
-            value?: string | undefined;
             usedByWorkflows: string[];
         }[] | undefined;
         tags?: {
@@ -510,7 +501,6 @@ export declare const packageManifestSchema: z.ZodEffects<z.ZodObject<{
         }[] | undefined;
         variables?: {
             name: string;
-            value?: string | undefined;
             usedByWorkflows: string[];
         }[] | undefined;
         tags?: {
@@ -583,7 +573,6 @@ export declare const packageManifestSchema: z.ZodEffects<z.ZodObject<{
         }[] | undefined;
         variables?: {
             name: string;
-            value?: string | undefined;
             usedByWorkflows: string[];
         }[] | undefined;
         tags?: {