n8n 2.33.2 → 2.34.0

package/dist/modules/n8n-packages/engine/import-orchestrator.js

@@ -12,40 +12,47 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ImportOrchestrator = void 0;
 const di_1 = require("@n8n/di");
 const node_types_1 = require("../../../node-types");
-const import_blocked_error_1 = require("./import-blocked.error");
 const credential_importer_1 = require("../entities/credential/credential-importer");
 const credential_missing_mode_1 = require("../entities/credential/credential-missing-mode");
 const data_table_importer_1 = require("../entities/data-table/data-table-importer");
 const folder_importer_1 = require("../entities/folder/folder-importer");
+const tag_importer_1 = require("../entities/tag/tag-importer");
+const tag_types_1 = require("../entities/tag/tag.types");
 const variable_importer_1 = require("../entities/variable/variable-importer");
 const missing_node_type_mode_1 = require("../entities/workflow/missing-node-type-mode");
 const workflow_importer_1 = require("../entities/workflow/workflow-importer");
 const workflow_publisher_1 = require("../entities/workflow/workflow-publisher");
 const n8n_packages_types_1 = require("../n8n-packages.types");
+const import_blocked_error_1 = require("./import-blocked.error");
 let ImportOrchestrator = class ImportOrchestrator {
-    constructor(credentialImporter, dataTableImporter, variableImporter, folderImporter, workflowImporter, workflowPublisher, nodeTypes) {
+    constructor(credentialImporter, dataTableImporter, variableImporter, tagImporter, folderImporter, workflowImporter, workflowPublisher, nodeTypes) {
         this.credentialImporter = credentialImporter;
         this.dataTableImporter = dataTableImporter;
         this.variableImporter = variableImporter;
+        this.tagImporter = tagImporter;
         this.folderImporter = folderImporter;
         this.workflowImporter = workflowImporter;
         this.workflowPublisher = workflowPublisher;
         this.nodeTypes = nodeTypes;
     }
-    async import(input) {
-        const plan = await this.plan(input);
-        if (plan.blockingIssues.length > 0) {
-            throw (0, import_blocked_error_1.toImportBlockedError)(plan.blockingIssues);
-        }
-        return await this.apply(plan);
+    async assertNotBlocked(plans) {
+        const issues = plans.flatMap((plan) => plan.blockingIssues);
+        const quotaFailure = await this.variableImporter.quotaFailure(plans.flatMap((plan) => plan.variablePlan.creations));
+        if (quotaFailure)
+            issues.push({ type: 'variable-limit-exceeded', ...quotaFailure });
+        if (issues.length > 0)
+            throw (0, import_blocked_error_1.toImportBlockedError)(issues);
     }
     async plan(input) {
-        const { context, folders, workflows, credentialRequest, dataTableRequest, variableRequest, options, } = input;
+        const { context, folders, workflows, credentialRequest, dataTableRequest, variableRequest, tagRequest, options, } = input;
         await this.workflowPublisher.assertCanPublish(context.user, context.projectId, options.workflowPublishingPolicy, input.projectPendingCreation);
         const credentialPlan = await this.credentialImporter.plan(context, credentialRequest);
         const dataTablePlan = await this.dataTableImporter.plan(context, dataTableRequest);
-        const variablePlan = await this.variableImporter.plan(context, variableRequest);
+        const variablePlan = await this.variableImporter.plan(context, variableRequest, {
+            projectPendingCreation: input.projectPendingCreation,
+        });
         const workflowPlan = await this.workflowImporter.plan(context, workflows, options);
+        const tagPlan = await this.tagImporter.plan(context, tagRequest, workflowPlan.items.filter((item) => item.action !== 'skip'));
         const folderContext = { ...context, folderConflictPolicy: options.folderConflictPolicy };
         const folderPlan = await this.folderImporter.plan(folderContext, folders);
         const missingNodeTypes = (0, missing_node_type_mode_1.collectMissingNodeTypes)(workflowPlan.items.filter((item) => item.action !== 'skip'), (nodeType) => this.nodeTypes.getSupportedVersions(nodeType));
@@ -57,6 +64,7 @@ let ImportOrchestrator = class ImportOrchestrator {
             dataTablePlan,
             variableRequest,
             variablePlan,
+            tagPlan,
             missingNodeTypes,
             missingNodeTypeMode: options.missingNodeTypeMode,
         });
@@ -68,44 +76,49 @@ let ImportOrchestrator = class ImportOrchestrator {
             folderPlan,
             dataTablePlan,
             variablePlan,
+            tagPlan,
             missingNodeTypes,
             blockingIssues,
         };
     }
-    async apply(plan) {
-        const { input, folderContext, credentialPlan, workflowPlan, folderPlan, dataTablePlan, variablePlan, } = plan;
-        const { context, credentialRequest, options } = input;
+    async apply(plan, seedWorkflowBindings) {
+        const { input, folderContext, credentialPlan, workflowPlan, folderPlan, dataTablePlan, variablePlan, tagPlan, } = plan;
+        const { context, credentialRequest } = input;
+        const variableResult = await this.variableImporter.apply(context, variablePlan);
+        await this.tagImporter.apply(context, tagPlan);
         const folderSummaries = await this.folderImporter.apply(folderContext, folderPlan);
         const credentialResult = await this.credentialImporter.apply(context, credentialRequest, credentialPlan);
         await this.dataTableImporter.apply(context, dataTablePlan);
-        const publishBlocked = new Map();
+        const blockedFromPublish = new Map();
         for (const sourceWorkflowId of (0, credential_missing_mode_1.workflowsBlockedFromPublish)(credentialRequest.requirements, new Set(credentialResult.stubbed))) {
-            publishBlocked.set(sourceWorkflowId, 'stub-credential');
+            blockedFromPublish.set(sourceWorkflowId, 'stub-credential');
         }
         for (const sourceWorkflowId of (0, missing_node_type_mode_1.workflowsWithMissingNodeTypes)(plan.missingNodeTypes)) {
-            publishBlocked.set(sourceWorkflowId, 'missing-node-type');
+            blockedFromPublish.set(sourceWorkflowId, 'missing-node-type');
         }
-        const { outcomes, bindings } = await this.workflowImporter.apply({
-            ...context,
-            publishingPolicy: options.workflowPublishingPolicy,
-            publishBlocked,
-        }, workflowPlan, (0, n8n_packages_types_1.createBindings)({ credentials: credentialResult.bindings }));
+        const { outcomes, bindings } = await this.workflowImporter.apply({ ...context, droppedTagIds: (0, tag_types_1.droppedTagIds)(tagPlan) }, workflowPlan, (0, n8n_packages_types_1.createBindings)({
+            credentials: credentialResult.bindings,
+            ...(seedWorkflowBindings ? { workflows: seedWorkflowBindings } : {}),
+        }));
         return {
-            workflowOutcomes: outcomes,
+            workflowOutcomes: outcomes.map((outcome) => withBlockedFromPublish(outcome, blockedFromPublish.get(outcome.sourceWorkflowId))),
             folderSummaries,
             bindings,
             credentialResult,
             dataTablePlan,
             variablePlan,
+            variableResult,
+            tagPlan,
         };
     }
-    collectBlockingIssues({ workflowPlan, credentialPlan, credentialRequest, folderPlan, dataTablePlan, variableRequest, variablePlan, missingNodeTypes, missingNodeTypeMode, }) {
+    collectBlockingIssues({ workflowPlan, credentialPlan, credentialRequest, folderPlan, dataTablePlan, variableRequest, variablePlan, tagPlan, missingNodeTypes, missingNodeTypeMode, }) {
         return [
             ...workflowPlan.conflicts.map((conflict) => ({ type: 'workflow-conflict', ...conflict })),
             ...workflowPlan.idConflicts.map((conflict) => ({ type: 'workflow-id-conflict', ...conflict })),
             ...workflowPlan.folderConflicts.map((conflict) => ({ type: 'workflow-folder-conflict', ...conflict })),
             ...folderPlan.conflicts.map((conflict) => ({ type: 'folder-conflict', ...conflict })),
             ...dataTablePlan.failures.map((failure) => ({ type: 'data-table-unresolved', ...failure })),
+            ...tagPlan.failures.map((failure) => ({ type: 'tag-unresolved', ...failure })),
             ...this.credentialImporter
                 .blockingFailures(credentialRequest, credentialPlan)
                 .map(toCredentialBlockingIssue),
@@ -124,8 +137,13 @@ let ImportOrchestrator = class ImportOrchestrator {
 exports.ImportOrchestrator = ImportOrchestrator;
 exports.ImportOrchestrator = ImportOrchestrator = __decorate([
     (0, di_1.Service)(),
-    __metadata("design:paramtypes", [credential_importer_1.CredentialImporter, data_table_importer_1.DataTableImporter, variable_importer_1.VariableImporter, folder_importer_1.FolderImporter, workflow_importer_1.WorkflowImporter, workflow_publisher_1.WorkflowPublisher, node_types_1.NodeTypes])
+    __metadata("design:paramtypes", [credential_importer_1.CredentialImporter, data_table_importer_1.DataTableImporter, variable_importer_1.VariableImporter, tag_importer_1.TagImporter, folder_importer_1.FolderImporter, workflow_importer_1.WorkflowImporter, workflow_publisher_1.WorkflowPublisher, node_types_1.NodeTypes])
 ], ImportOrchestrator);
+function withBlockedFromPublish(outcome, blockedFromPublish) {
+    if (outcome.status === 'skipped' || !blockedFromPublish)
+        return outcome;
+    return { ...outcome, blockedFromPublish };
+}
 function toCredentialBlockingIssue(failure) {
     const { kind, sourceId, targetId, expectedType, actualType, usedByWorkflows } = failure;
     return {

package/dist/modules/n8n-packages/engine/import-orchestrator.js.map

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

package/dist/modules/n8n-packages/engine/import-result.d.ts

@@ -1,9 +1,12 @@
-import type { PreparedWorkflow, WorkflowImportOutcome } from '../entities/workflow/workflow-import.types';
-import type { ImportBindingMap, ImportCredentialSummary, ImportedFolderSummary, ImportedProjectSummary, ImportedWorkflowSummary, ImportPackageSummary, ImportResult, ImportVariableSummary, PackageImportBindings } from '../n8n-packages.types';
+import type { TagImportPlan } from '../entities/tag/tag.types';
+import type { VariableApplyResult, VariableImportPlan } from '../entities/variable/variable.types';
+import type { PersistedWorkflowOutcome, PreparedWorkflow } from '../entities/workflow/workflow-import.types';
+import type { PackagePublishingResults } from '../entities/workflow/workflow-publisher';
+import type { ImportBindingMap, ImportCredentialSummary, ImportedFolderSummary, ImportedProjectSummary, ImportedWorkflowSummary, ImportPackageSummary, ImportResult, ImportTagSummary, ImportVariableSummary, PackageImportBindings } from '../n8n-packages.types';
 import type { PackageManifest } from '../spec/manifest.schema';
 import type { PackageCredentialRequirement } from '../spec/requirements.schema';
 export declare function toPackageSummary(manifest: PackageManifest): ImportPackageSummary;
-export declare function toImportedWorkflowSummaries(outcomes: WorkflowImportOutcome[], projectId: string): ImportedWorkflowSummary[];
+export declare function toImportedWorkflowSummaries(outcomes: PersistedWorkflowOutcome[], projectId: string, published: PackagePublishingResults): ImportedWorkflowSummary[];
 export declare function buildImportResult(input: {
     package: ImportPackageSummary;
     workflows: ImportedWorkflowSummary[];
@@ -12,8 +15,17 @@ export declare function buildImportResult(input: {
     bindings: PackageImportBindings;
     credentials: ImportCredentialSummary;
     variables: ImportVariableSummary;
+    tags: ImportTagSummary;
 }): ImportResult;
-export declare function assertPackageImportApiKeyScopes(apiKeyScopes: string[] | undefined, required: string[]): void;
+export declare function reconcileVariableSummary(input: {
+    matched: Iterable<string>;
+    missing: Iterable<string>;
+    stubbed: Iterable<string>;
+    skipped: Iterable<string>;
+}): ImportVariableSummary;
+export declare function toVariableSummary(plan: VariableImportPlan, result: VariableApplyResult): ImportVariableSummary;
+export declare function toTagSummary(plan: TagImportPlan): ImportTagSummary;
+export declare function unionTagSummaries(summaries: ImportTagSummary[]): ImportTagSummary;
 export declare function identifyRequirements<T extends {
     usedByWorkflows: string[];
 }>(requirements: T[] | undefined, workflows: PreparedWorkflow[]): T[] | undefined;

package/dist/modules/n8n-packages/engine/import-result.js

@@ -3,10 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.toPackageSummary = toPackageSummary;
 exports.toImportedWorkflowSummaries = toImportedWorkflowSummaries;
 exports.buildImportResult = buildImportResult;
-exports.assertPackageImportApiKeyScopes = assertPackageImportApiKeyScopes;
+exports.reconcileVariableSummary = reconcileVariableSummary;
+exports.toVariableSummary = toVariableSummary;
+exports.toTagSummary = toTagSummary;
+exports.unionTagSummaries = unionTagSummaries;
 exports.identifyRequirements = identifyRequirements;
 exports.scopeCredentialBindingsToRequirements = scopeCredentialBindingsToRequirements;
-const forbidden_error_1 = require("../../../errors/response-errors/forbidden.error");
 const n8n_packages_types_1 = require("../n8n-packages.types");
 function toPackageSummary(manifest) {
     return {
@@ -15,17 +17,21 @@ function toPackageSummary(manifest) {
         exportedAt: manifest.exportedAt,
     };
 }
-function toImportedWorkflowSummaries(outcomes, projectId) {
-    return outcomes.map(({ workflow, sourceWorkflowId, status, publishing }) => ({
-        sourceWorkflowId,
-        localId: workflow.id,
-        name: workflow.name,
-        projectId,
-        parentFolderId: workflow.parentFolder?.id ?? null,
-        activeVersionId: workflow.activeVersionId ?? null,
-        publishing,
-        status,
-    }));
+function toImportedWorkflowSummaries(outcomes, projectId, published) {
+    return outcomes.map(({ workflow, sourceWorkflowId, status }) => {
+        const result = published.get(sourceWorkflowId);
+        const current = result?.workflow ?? workflow;
+        return {
+            sourceWorkflowId,
+            localId: current.id,
+            name: current.name,
+            projectId,
+            parentFolderId: current.parentFolder?.id ?? null,
+            activeVersionId: current.activeVersionId ?? null,
+            publishing: result?.publishing ?? { state: 'unchanged' },
+            status,
+        };
+    });
 }
 function buildImportResult(input) {
     return {
@@ -36,16 +42,46 @@ function buildImportResult(input) {
         bindings: (0, n8n_packages_types_1.serializeBindings)(input.bindings),
         credentials: input.credentials,
         variables: input.variables,
+        tags: input.tags,
     };
 }
-function assertPackageImportApiKeyScopes(apiKeyScopes, required) {
-    if (apiKeyScopes === undefined)
-        return;
-    for (const scope of required) {
-        if (!apiKeyScopes.includes(scope)) {
-            throw new forbidden_error_1.ForbiddenError('Forbidden');
-        }
+function reconcileVariableSummary(input) {
+    const matched = new Set(input.matched);
+    const stubbed = new Set(input.stubbed);
+    const skipped = new Set(input.skipped);
+    for (const name of skipped) {
+        if (!stubbed.has(name))
+            matched.add(name);
     }
+    return {
+        matched: [...matched],
+        stubbed: [...stubbed],
+        missing: [...new Set(input.missing)].filter((name) => !stubbed.has(name) && !skipped.has(name)),
+    };
+}
+function toVariableSummary(plan, result) {
+    return reconcileVariableSummary({
+        matched: plan.matched,
+        missing: plan.missing.map(({ name }) => name),
+        stubbed: result.stubbed,
+        skipped: result.skippedExisting,
+    });
+}
+function toTagSummary(plan) {
+    return {
+        matched: plan.matched.map(({ name }) => name),
+        created: plan.creations.map(({ name }) => name),
+        renamed: plan.renames.map(({ to }) => to),
+        skipped: plan.dropped.map(({ name }) => name),
+    };
+}
+function unionTagSummaries(summaries) {
+    return {
+        matched: [...new Set(summaries.flatMap(({ matched }) => matched))],
+        created: [...new Set(summaries.flatMap(({ created }) => created))],
+        renamed: [...new Set(summaries.flatMap(({ renamed }) => renamed))],
+        skipped: [...new Set(summaries.flatMap(({ skipped }) => skipped))],
+    };
 }
 function identifyRequirements(requirements, workflows) {
     if (!requirements)

package/dist/modules/n8n-packages/engine/import-result.js.map

@@ -1 +1 @@
-{"version":3,"file":"import-result.js","sourceRoot":"","sources":["../../../../src/modules/n8n-packages/engine/import-result.ts"],"names":[],"mappings":";;;;;;;;AAAA,8EAA0E;AAM1E,8DAA0D;AAe1D,0BAAiC,QAAyB;IACzD,OAAO;QACN,gBAAgB,EAAE,QAAQ,CAAC,gBAAgB;QAC3C,QAAQ,EAAE,QAAQ,CAAC,QAAQ;QAC3B,UAAU,EAAE,QAAQ,CAAC,UAAU;KAC/B,CAAC;AACH,CAAC;AAED,qCACC,QAAiC,EACjC,SAAiB;IAEjB,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,EAAE,QAAQ,EAAE,gBAAgB,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,CAAC;QAC5E,gBAAgB;QAChB,OAAO,EAAE,QAAQ,CAAC,EAAE;QACpB,IAAI,EAAE,QAAQ,CAAC,IAAI;QACnB,SAAS;QACT,cAAc,EAAE,QAAQ,CAAC,YAAY,EAAE,EAAE,IAAI,IAAI;QACjD,eAAe,EAAE,QAAQ,CAAC,eAAe,IAAI,IAAI;QACjD,UAAU;QACV,MAAM;KACN,CAAC,CAAC,CAAC;AACL,CAAC;AAED,2BAAkC,KAQjC;IACA,OAAO;QACN,OAAO,EAAE,KAAK,CAAC,OAAO;QACtB,SAAS,EAAE,KAAK,CAAC,SAAS;QAC1B,OAAO,EAAE,KAAK,CAAC,OAAO;QACtB,QAAQ,EAAE,KAAK,CAAC,QAAQ;QACxB,QAAQ,EAAE,IAAA,sCAAiB,EAAC,KAAK,CAAC,QAAQ,CAAC;QAC3C,WAAW,EAAE,KAAK,CAAC,WAAW;QAC9B,SAAS,EAAE,KAAK,CAAC,SAAS;KAC1B,CAAC;AACH,CAAC;AAMD,yCACC,YAAkC,EAClC,QAAkB;IAElB,IAAI,YAAY,KAAK,SAAS;QAAE,OAAO;IACvC,KAAK,MAAM,KAAK,IAAI,QAAQ,EAAE,CAAC;QAC9B,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YACnC,MAAM,IAAI,gCAAc,CAAC,WAAW,CAAC,CAAC;QACvC,CAAC;IACF,CAAC;AACF,CAAC;AAKD,8BACC,YAA6B,EAC7B,SAA6B;IAE7B,IAAI,CAAC,YAAY;QAAE,OAAO,SAAS,CAAC;IAEpC,MAAM,WAAW,GAAG,IAAI,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC,CAAC;IACpF,OAAO,YAAY;SACjB,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;QACtB,GAAG,WAAW;QACd,eAAe,EAAE,WAAW,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;KAChF,CAAC,CAAC;SACF,MAAM,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,WAAW,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;AACnE,CAAC;AAOD,+CACC,QAAsC,EACtC,YAAwD;IAExD,IAAI,CAAC,QAAQ;QAAE,OAAO,SAAS,CAAC;IAEhC,MAAM,cAAc,GAAG,IAAI,GAAG,CAAC,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC;IAC1F,OAAO,IAAI,GAAG,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC,cAAc,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;AACpF,CAAC"}
+{"version":3,"file":"import-result.js","sourceRoot":"","sources":["../../../../src/modules/n8n-packages/engine/import-result.ts"],"names":[],"mappings":"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"}

package/dist/modules/n8n-packages/engine/import-telemetry.d.ts

@@ -1,16 +1,18 @@
 import type { EventService } from '../../../events/event.service';
 import type { CredentialBindingRequest } from '../entities/credential/credential.types';
 import type { DataTableImportRequest } from '../entities/data-table/data-table.types';
+import type { TagImportRequest } from '../entities/tag/tag.types';
 import type { VariableImportRequest } from '../entities/variable/variable.types';
 import type { ImportContext, ImportPackageRequest } from '../n8n-packages.types';
-import type { ImportOrchestrationResult } from './import-orchestrator';
+import type { ImportContentResult } from './import-orchestrator';
 import type { PackageManifest } from '../spec/manifest.schema';
 export interface PackageImportScope {
     context: ImportContext;
-    imported: ImportOrchestrationResult;
+    imported: ImportContentResult;
     credentialRequest: CredentialBindingRequest;
     dataTableRequest: DataTableImportRequest;
     variableRequest: VariableImportRequest;
+    tagRequest: TagImportRequest;
 }
 export declare function emitPackageImportedEvent(eventService: EventService, params: {
     request: ImportPackageRequest;

package/dist/modules/n8n-packages/engine/import-telemetry.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.emitPackageImportedEvent = emitPackageImportedEvent;
+const n8n_packages_types_1 = require("../n8n-packages.types");
+const import_result_1 = require("./import-result");
 function emitPackageImportedEvent(eventService, params) {
     const { request, manifest, scopes } = params;
     const workflowOutcomes = scopes.flatMap(({ imported }) => imported.workflowOutcomes);
@@ -14,10 +16,17 @@ function emitPackageImportedEvent(eventService, params) {
     const dataTableRequirements = scopes.reduce((total, { dataTableRequest }) => total + (dataTableRequest.requirements?.length ?? 0), 0);
     const dataTablesMatched = dataTablePlans.reduce((total, plan) => total + plan.matchedCount, 0);
     const dataTablesCreated = dataTablePlans.reduce((total, plan) => total + plan.creations.length, 0);
-    const variablePlans = scopes.map(({ imported }) => imported.variablePlan);
     const variableRequirements = scopes.reduce((total, { variableRequest }) => total + (variableRequest.requirements?.length ?? 0), 0);
-    const variablesMatched = variablePlans.reduce((total, plan) => total + plan.matched.length, 0);
-    const variablesMissing = variablePlans.reduce((total, plan) => total + plan.missing.length, 0);
+    const variableSummary = (0, import_result_1.reconcileVariableSummary)({
+        matched: scopes.flatMap(({ imported }) => imported.variablePlan.matched),
+        missing: scopes.flatMap(({ imported }) => imported.variablePlan.missing.map(({ name }) => name)),
+        stubbed: scopes.flatMap(({ imported }) => imported.variableResult.stubbed),
+        skipped: scopes.flatMap(({ imported }) => imported.variableResult.skippedExisting),
+    });
+    const variablesCreated = scopes.reduce((total, { imported }) => total + imported.variableResult.createdCount, 0);
+    const tagPlans = scopes.map(({ imported }) => imported.tagPlan);
+    const uniqueTagIds = (pick) => new Set(tagPlans.flatMap((plan) => pick(plan).map(({ id }) => id))).size;
+    const tagRequirements = new Set(scopes.flatMap(({ tagRequest }) => (tagRequest.requirements ?? []).map(({ id }) => id))).size;
     const folderId = scopes.length === 1 ? scopes[0].context.folderId : null;
     eventService.emit('n8n-package-imported', {
         user: request.user,
@@ -35,6 +44,9 @@ function emitPackageImportedEvent(eventService, params) {
             dataTableMissingMode: request.dataTableMissingMode,
             dataTableSchemaConflictPolicy: request.dataTableSchemaConflictPolicy,
             variableMissingMode: request.variableMissingMode,
+            variableParentPolicy: request.variableParentPolicy ?? n8n_packages_types_1.VariableParentPolicy.Project,
+            tagMissingMode: request.tagMissingMode,
+            tagConflictPolicy: request.tagConflictPolicy,
         },
         packageSourceId: manifest.sourceId,
         packageVersion: manifest.packageFormatVersion,
@@ -60,10 +72,18 @@ function emitPackageImportedEvent(eventService, params) {
                 requirements: dataTableRequirements,
             },
             variables: {
-                matched: variablesMatched,
-                missing: variablesMissing,
+                matched: variableSummary.matched.length,
+                missing: variableSummary.missing.length,
+                created: variablesCreated,
                 requirements: variableRequirements,
             },
+            tags: {
+                matched: uniqueTagIds((plan) => plan.matched),
+                created: uniqueTagIds((plan) => plan.creations),
+                renamed: uniqueTagIds((plan) => plan.renames),
+                skipped: uniqueTagIds((plan) => plan.dropped),
+                requirements: tagRequirements,
+            },
         },
     });
 }

package/dist/modules/n8n-packages/engine/import-telemetry.js.map

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

package/dist/modules/n8n-packages/engine/n8n-package-parser.js

@@ -127,6 +127,7 @@ let N8nPackageParser = class N8nPackageParser {
             sourceWorkflowId: entry.id,
             sourcePublished: wire.isPublished,
             parentFolderId,
+            ...(wire.tagIds !== undefined ? { tagIds: wire.tagIds } : {}),
         };
     }
     async readFolder(reader, entry) {
@@ -192,6 +193,9 @@ let N8nPackageParser = class N8nPackageParser {
             name: project.name,
             ...(project.description !== undefined ? { description: project.description } : {}),
             ...(project.icon !== undefined ? { icon: project.icon } : {}),
+            ...(project.customTelemetryTags !== undefined
+                ? { customTelemetryTags: project.customTelemetryTags }
+                : {}),
         };
     }
     async readJson(reader, path, label) {

package/dist/modules/n8n-packages/engine/n8n-package-parser.js.map

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

package/dist/modules/n8n-packages/engine/package-layout.d.ts

@@ -1,4 +1,5 @@
 import type { ManifestEntry } from '../spec/manifest.schema';
 export declare function foldersInScope(entries: ManifestEntry[] | undefined, basePrefix?: string): ManifestEntry[];
 export declare function workflowsInScope(entries: ManifestEntry[] | undefined, basePrefix?: string): ManifestEntry[];
+export declare function deriveVariableScope(entries: ManifestEntry[] | undefined, basePrefix: string, name: string): 'global' | 'project';
 export declare function deriveParentFolderId(workflowTarget: string, folderTargetToId: Map<string, string>): string | null;

package/dist/modules/n8n-packages/engine/package-layout.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.foldersInScope = foldersInScope;
 exports.workflowsInScope = workflowsInScope;
+exports.deriveVariableScope = deriveVariableScope;
 exports.deriveParentFolderId = deriveParentFolderId;
 const n8n_workflow_1 = require("n8n-workflow");
 function foldersInScope(entries, basePrefix = '') {
@@ -11,6 +12,14 @@ function workflowsInScope(entries, basePrefix = '') {
     return (entries ?? []).filter((entry) => entry.target.startsWith(`${basePrefix}workflows/`) ||
         entry.target.startsWith(`${basePrefix}folders/`));
 }
+function deriveVariableScope(entries, basePrefix, name) {
+    const named = (entries ?? []).filter((entry) => entry.name === name);
+    if (named.some((entry) => entry.target.startsWith(`${basePrefix}variables/`)))
+        return 'project';
+    if (named.some((entry) => entry.target.startsWith('variables/')))
+        return 'global';
+    return 'project';
+}
 function deriveParentFolderId(workflowTarget, folderTargetToId) {
     const idx = workflowTarget.lastIndexOf('/workflows/');
     if (idx === -1)

package/dist/modules/n8n-packages/engine/package-layout.js.map

@@ -1 +1 @@
-{"version":3,"file":"package-layout.js","sourceRoot":"","sources":["../../../../src/modules/n8n-packages/engine/package-layout.ts"],"names":[],"mappings":";;;;;AAAA,+CAAyC;AAIzC,wBACC,OAAoC,EACpC,UAAU,GAAG,EAAE;IAEf,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,UAAU,UAAU,CAAC,CAAC,CAAC;AAC5F,CAAC;AAED,0BACC,OAAoC,EACpC,UAAU,GAAG,EAAE;IAEf,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,MAAM,CAC5B,CAAC,KAAK,EAAE,EAAE,CACT,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,UAAU,YAAY,CAAC;QAClD,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,UAAU,UAAU,CAAC,CACjD,CAAC;AACH,CAAC;AAED,8BACC,cAAsB,EACtB,gBAAqC;IAErC,MAAM,GAAG,GAAG,cAAc,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC;IACtD,IAAI,GAAG,KAAK,CAAC,CAAC;QAAE,OAAO,IAAI,CAAC;IAE5B,MAAM,eAAe,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IAErD,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,UAAU,CAAC;QAAE,OAAO,IAAI,CAAC;IACvD,MAAM,QAAQ,GAAG,gBAAgB,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;IACvD,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QAC5B,MAAM,IAAI,wBAAS,CAClB,wBAAwB,cAAc,6BAA6B,eAAe,wCAAwC,CAC1H,CAAC;IACH,CAAC;IACD,OAAO,QAAQ,CAAC;AACjB,CAAC"}
+{"version":3,"file":"package-layout.js","sourceRoot":"","sources":["../../../../src/modules/n8n-packages/engine/package-layout.ts"],"names":[],"mappings":";;;;;;AAAA,+CAAyC;AAIzC,wBACC,OAAoC,EACpC,UAAU,GAAG,EAAE;IAEf,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,UAAU,UAAU,CAAC,CAAC,CAAC;AAC5F,CAAC;AAED,0BACC,OAAoC,EACpC,UAAU,GAAG,EAAE;IAEf,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,MAAM,CAC5B,CAAC,KAAK,EAAE,EAAE,CACT,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,UAAU,YAAY,CAAC;QAClD,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,UAAU,UAAU,CAAC,CACjD,CAAC;AACH,CAAC;AAGD,6BACC,OAAoC,EACpC,UAAkB,EAClB,IAAY;IAEZ,MAAM,KAAK,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;IACrE,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,UAAU,YAAY,CAAC,CAAC;QAAE,OAAO,SAAS,CAAC;IAChG,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC;QAAE,OAAO,QAAQ,CAAC;IAClF,OAAO,SAAS,CAAC;AAClB,CAAC;AAED,8BACC,cAAsB,EACtB,gBAAqC;IAErC,MAAM,GAAG,GAAG,cAAc,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC;IACtD,IAAI,GAAG,KAAK,CAAC,CAAC;QAAE,OAAO,IAAI,CAAC;IAE5B,MAAM,eAAe,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IAErD,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,UAAU,CAAC;QAAE,OAAO,IAAI,CAAC;IACvD,MAAM,QAAQ,GAAG,gBAAgB,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;IACvD,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QAC5B,MAAM,IAAI,wBAAS,CAClB,wBAAwB,cAAc,6BAA6B,eAAe,wCAAwC,CAC1H,CAAC;IACH,CAAC;IACD,OAAO,QAAQ,CAAC;AACjB,CAAC"}

package/dist/modules/n8n-packages/engine/project-package-importer.d.ts

@@ -1,6 +1,7 @@
 import { LicenseState } from '@n8n/backend-common';
 import { EventService } from '../../../events/event.service';
 import { ProjectImporter } from '../entities/project/project-importer';
+import { WorkflowPublisher } from '../entities/workflow/workflow-publisher';
 import type { PackageReader } from '../io/package-reader';
 import type { ImportPackageRequest, ImportResult } from '../n8n-packages.types';
 import { ImportOrchestrator } from './import-orchestrator';
@@ -10,9 +11,10 @@ export declare class ProjectPackageImporter {
     private readonly packageParser;
     private readonly projectImporter;
     private readonly importOrchestrator;
+    private readonly workflowPublisher;
     private readonly eventService;
     private readonly licenseState;
-    constructor(packageParser: N8nPackageParser, projectImporter: ProjectImporter, importOrchestrator: ImportOrchestrator, eventService: EventService, licenseState: LicenseState);
+    constructor(packageParser: N8nPackageParser, projectImporter: ProjectImporter, importOrchestrator: ImportOrchestrator, workflowPublisher: WorkflowPublisher, eventService: EventService, licenseState: LicenseState);
     import(request: ImportPackageRequest, reader: PackageReader, manifest: PackageManifest): Promise<ImportResult>;
     private buildImportContextForProject;
     private assertAdequatePermissions;