refactor(core): Move Logger to @n8n/backend-common (#15721)

packages/@n8n/backend-common/package.json

@@ -21,10 +21,14 @@
     "dist/**/*"
   ],
   "dependencies": {
+    "@n8n/config": "workspace:^",
     "@n8n/constants": "workspace:^",
     "@n8n/di": "workspace:^",
+    "callsites": "catalog:",
     "n8n-workflow": "workspace:^",
-    "reflect-metadata": "catalog:"
+    "picocolors": "catalog:",
+    "reflect-metadata": "catalog:",
+    "winston": "3.14.2"
   },
   "devDependencies": {
     "@n8n/typescript-config": "workspace:*"

packages/@n8n/backend-common/src/environment.ts

@@ -0,0 +1,5 @@
+const { NODE_ENV } = process.env;
+
+export const inTest = NODE_ENV === 'test';
+export const inProduction = NODE_ENV === 'production';
+export const inDevelopment = !NODE_ENV || NODE_ENV === 'development';

packages/@n8n/backend-common/src/index.ts

@@ -1,10 +1,6 @@
 export * from './license-state';
 export * from './types';
 
-const { NODE_ENV } = process.env;
+export { inDevelopment, inProduction, inTest } from './environment';
-
-export const inTest = NODE_ENV === 'test';
-export const inProduction = NODE_ENV === 'production';
-export const inDevelopment = !NODE_ENV || NODE_ENV === 'development';
-
 export { isObjectLiteral } from './utils/is-object-literal';
+export { Logger } from './logging/logger';

packages/@n8n/backend-common/src/logging/logger.ts

@@ -1,4 +1,3 @@
-import { inDevelopment, inProduction, isObjectLiteral } from '@n8n/backend-common';
 import type { LogScope } from '@n8n/config';
 import { GlobalConfig, InstanceSettingsConfig } from '@n8n/config';
 import { Service } from '@n8n/di';
@@ -15,6 +14,9 @@ import path, { basename } from 'node:path';
 import pc from 'picocolors';
 import winston from 'winston';
 
+import { inDevelopment, inProduction } from '../environment';
+import { isObjectLiteral } from '../utils/is-object-literal';
+
 const noOp = () => {};
 
 @Service()

packages/@n8n/db/src/migrations/migration-helpers.ts

@@ -1,9 +1,10 @@
+import { Logger } from '@n8n/backend-common';
 import { GlobalConfig } from '@n8n/config';
 import { Container } from '@n8n/di';
 import type { ObjectLiteral } from '@n8n/typeorm';
 import type { QueryRunner } from '@n8n/typeorm/query-runner/QueryRunner';
 import { readFileSync, rmSync } from 'fs';
-import { InstanceSettings, Logger } from 'n8n-core';
+import { InstanceSettings } from 'n8n-core';
 import { jsonParse, UnexpectedError } from 'n8n-workflow';
 
 import { createSchemaBuilder } from './dsl';

packages/@n8n/db/src/migrations/migration-types.ts

@@ -1,5 +1,5 @@
+import type { Logger } from '@n8n/backend-common';
 import type { QueryRunner, ObjectLiteral } from '@n8n/typeorm';
-import type { Logger } from 'n8n-core';
 
 import type { createSchemaBuilder } from './dsl';
 

packages/@n8n/db/src/repositories/execution.repository.ts

@@ -1,3 +1,4 @@
+import { Logger } from '@n8n/backend-common';
 import { GlobalConfig } from '@n8n/config';
 import { Service } from '@n8n/di';
 import type {
@@ -22,7 +23,7 @@ import {
 import { DateUtils } from '@n8n/typeorm/util/DateUtils';
 import { parse, stringify } from 'flatted';
 import pick from 'lodash/pick';
-import { BinaryDataService, ErrorReporter, Logger } from 'n8n-core';
+import { BinaryDataService, ErrorReporter } from 'n8n-core';
 import { ExecutionCancelledError, UnexpectedError } from 'n8n-workflow';
 import type {
 	AnnotationVote,

packages/@n8n/db/src/subscribers/user-subscriber.ts

@@ -1,7 +1,8 @@
+import { Logger } from '@n8n/backend-common';
 import { Container } from '@n8n/di';
 import type { EntitySubscriberInterface, UpdateEvent } from '@n8n/typeorm';
 import { EventSubscriber } from '@n8n/typeorm';
-import { ErrorReporter, Logger } from 'n8n-core';
+import { ErrorReporter } from 'n8n-core';
 import { UnexpectedError } from 'n8n-workflow';
 
 import { Project, User } from '../entities';

packages/cli/src/__tests__/credentials-overwrites.test.ts

@@ -1,6 +1,7 @@
+import type { Logger } from '@n8n/backend-common';
 import type { GlobalConfig } from '@n8n/config';
 import { mock } from 'jest-mock-extended';
-import { UnrecognizedCredentialTypeError, type Logger } from 'n8n-core';
+import { UnrecognizedCredentialTypeError } from 'n8n-core';
 import type { ICredentialType } from 'n8n-workflow';
 
 import type { CredentialTypes } from '@/credential-types';

packages/cli/src/__tests__/external-hooks.test.ts

@@ -1,9 +1,10 @@
+import type { Logger } from '@n8n/backend-common';
 import type { GlobalConfig } from '@n8n/config';
 import type { WorkflowRepository } from '@n8n/db';
 import type { CredentialsRepository, SettingsRepository } from '@n8n/db';
 import type { UserRepository } from '@n8n/db';
 import { mock } from 'jest-mock-extended';
-import type { ErrorReporter, Logger } from 'n8n-core';
+import type { ErrorReporter } from 'n8n-core';
 import type { IWorkflowBase } from 'n8n-workflow';
 import { UnexpectedError } from 'n8n-workflow';
 

packages/cli/src/abstract-server.ts

@@ -1,4 +1,4 @@
-import { inTest, inDevelopment } from '@n8n/backend-common';
+import { inTest, inDevelopment, Logger } from '@n8n/backend-common';
 import { GlobalConfig } from '@n8n/config';
 import { OnShutdown } from '@n8n/decorators';
 import { Container, Service } from '@n8n/di';
@@ -8,7 +8,6 @@ import { engine as expressHandlebars } from 'express-handlebars';
 import { readFile } from 'fs/promises';
 import type { Server } from 'http';
 import isbot from 'isbot';
-import { Logger } from 'n8n-core';
 
 import config from '@/config';
 import { N8N_VERSION, TEMPLATES_DIR } from '@/constants';

packages/cli/src/active-executions.ts

@@ -1,7 +1,7 @@
+import { Logger } from '@n8n/backend-common';
 import type { CreateExecutionPayload, IExecutionDb } from '@n8n/db';
 import { ExecutionRepository } from '@n8n/db';
 import { Service } from '@n8n/di';
-import { Logger } from 'n8n-core';
 import type {
 	IDeferredPromise,
 	IExecuteResponsePromiseData,

packages/cli/src/active-workflow-manager.ts

@@ -1,4 +1,5 @@
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
+import { Logger } from '@n8n/backend-common';
 import { WorkflowsConfig } from '@n8n/config';
 import type { WorkflowEntity, IWorkflowDb } from '@n8n/db';
 import { WorkflowRepository } from '@n8n/db';
@@ -9,7 +10,6 @@ import {
 	ActiveWorkflows,
 	ErrorReporter,
 	InstanceSettings,
-	Logger,
 	PollContext,
 	TriggerContext,
 	type IGetExecutePollFunctions,

packages/cli/src/auth/auth.service.ts

@@ -1,3 +1,4 @@
+import { Logger } from '@n8n/backend-common';
 import { GlobalConfig } from '@n8n/config';
 import type { User } from '@n8n/db';
 import { InvalidAuthTokenRepository, UserRepository } from '@n8n/db';
@@ -6,7 +7,6 @@ import { createHash } from 'crypto';
 import type { NextFunction, Response } from 'express';
 import { JsonWebTokenError, TokenExpiredError } from 'jsonwebtoken';
 import type { StringValue as TimeUnitValue } from 'ms';
-import { Logger } from 'n8n-core';
 
 import config from '@/config';
 import { AUTH_COOKIE_NAME, RESPONSE_ERROR_MESSAGES, Time } from '@/constants';

packages/cli/src/commands/base-command.ts

@@ -1,5 +1,5 @@
 import 'reflect-metadata';
-import { inDevelopment, inTest, LicenseState } from '@n8n/backend-common';
+import { inDevelopment, inTest, LicenseState, Logger } from '@n8n/backend-common';
 import { GlobalConfig } from '@n8n/config';
 import { LICENSE_FEATURES } from '@n8n/constants';
 import { Container } from '@n8n/di';
@@ -8,7 +8,6 @@ import {
 	BinaryDataConfig,
 	BinaryDataService,
 	InstanceSettings,
-	Logger,
 	ObjectStoreService,
 	DataDeduplicationService,
 	ErrorReporter,

packages/cli/src/commands/db/__tests__/revert.test.ts

@@ -1,8 +1,8 @@
+import { Logger } from '@n8n/backend-common';
 import type { IrreversibleMigration, ReversibleMigration } from '@n8n/db';
 import type { Migration, MigrationExecutor } from '@n8n/typeorm';
 import { type DataSource } from '@n8n/typeorm';
 import { mock } from 'jest-mock-extended';
-import { Logger } from 'n8n-core';
 
 import { main } from '@/commands/db/revert';
 import { mockInstance } from '@test/mocking';

packages/cli/src/commands/db/revert.ts

@@ -1,3 +1,4 @@
+import { Logger } from '@n8n/backend-common';
 import type { Migration } from '@n8n/db';
 import { wrapMigration } from '@n8n/db';
 import { Container } from '@n8n/di';
@@ -6,7 +7,6 @@ import type { DataSourceOptions as ConnectionOptions } from '@n8n/typeorm';
 // eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import
 import { MigrationExecutor, DataSource as Connection } from '@n8n/typeorm';
 import { Command, Flags } from '@oclif/core';
-import { Logger } from 'n8n-core';
 
 import { DbConnectionOptions } from '@/databases/db-connection-options';
 

packages/cli/src/concurrency/concurrency-control.service.ts

@@ -1,7 +1,7 @@
+import { Logger } from '@n8n/backend-common';
 import { ExecutionRepository } from '@n8n/db';
 import { Service } from '@n8n/di';
 import { capitalize } from 'lodash';
-import { Logger } from 'n8n-core';
 import type { WorkflowExecuteMode as ExecutionMode } from 'n8n-workflow';
 
 import config from '@/config';

packages/cli/src/config/index.ts

@@ -1,11 +1,10 @@
-import { inTest } from '@n8n/backend-common';
+import { inTest, Logger } from '@n8n/backend-common';
 import { GlobalConfig } from '@n8n/config';
 import { Container } from '@n8n/di';
 import convict from 'convict';
 import { flatten } from 'flat';
 import { readFileSync } from 'fs';
 import merge from 'lodash/merge';
-import { Logger } from 'n8n-core';
 import { setGlobalState, UserError } from 'n8n-workflow';
 import assert from 'node:assert';
 

packages/cli/src/controllers/__tests__/auth.controller.test.ts

@@ -1,10 +1,10 @@
 import type { LoginRequestDto } from '@n8n/api-types';
+import { Logger } from '@n8n/backend-common';
 import type { User } from '@n8n/db';
 import { UserRepository } from '@n8n/db';
 import { Container } from '@n8n/di';
 import type { Response } from 'express';
 import { mock } from 'jest-mock-extended';
-import { Logger } from 'n8n-core';
 
 import * as auth from '@/auth';
 import { AuthService } from '@/auth/auth.service';

packages/cli/src/controllers/__tests__/owner.controller.test.ts

@@ -1,10 +1,10 @@
 import type { DismissBannerRequestDto, OwnerSetupRequestDto } from '@n8n/api-types';
+import type { Logger } from '@n8n/backend-common';
 import type { User } from '@n8n/db';
 import type { PublicUser, SettingsRepository } from '@n8n/db';
 import type { UserRepository } from '@n8n/db';
 import type { Response } from 'express';
 import { mock } from 'jest-mock-extended';
-import type { Logger } from 'n8n-core';
 
 import type { AuthService } from '@/auth/auth.service';
 import config from '@/config';

packages/cli/src/controllers/auth.controller.ts

@@ -1,10 +1,10 @@
 import { LoginRequestDto, ResolveSignupTokenQueryDto } from '@n8n/api-types';
+import { Logger } from '@n8n/backend-common';
 import type { User, PublicUser } from '@n8n/db';
 import { UserRepository } from '@n8n/db';
 import { Body, Get, Post, Query, RestController } from '@n8n/decorators';
 import { isEmail } from 'class-validator';
 import { Response } from 'express';
-import { Logger } from 'n8n-core';
 
 import { handleEmailLogin, handleLdapLogin } from '@/auth';
 import { AuthService } from '@/auth/auth.service';

packages/cli/src/controllers/e2e.controller.ts

@@ -1,11 +1,11 @@
 import type { PushMessage } from '@n8n/api-types';
+import { Logger } from '@n8n/backend-common';
 import type { BooleanLicenseFeature, NumericLicenseFeature } from '@n8n/constants';
 import { LICENSE_FEATURES, LICENSE_QUOTAS, UNLIMITED_LICENSE_QUOTA } from '@n8n/constants';
 import { SettingsRepository, UserRepository } from '@n8n/db';
 import { Patch, Post, RestController } from '@n8n/decorators';
 import { Container } from '@n8n/di';
 import { Request } from 'express';
-import { Logger } from 'n8n-core';
 import { v4 as uuid } from 'uuid';
 
 import { ActiveWorkflowManager } from '@/active-workflow-manager';

packages/cli/src/controllers/invitation.controller.ts

@@ -1,9 +1,9 @@
 import { AcceptInvitationRequestDto, InviteUsersRequestDto } from '@n8n/api-types';
+import { Logger } from '@n8n/backend-common';
 import type { User } from '@n8n/db';
 import { UserRepository } from '@n8n/db';
 import { Post, GlobalScope, RestController, Body, Param } from '@n8n/decorators';
 import { Response } from 'express';
-import { Logger } from 'n8n-core';
 
 import { AuthService } from '@/auth/auth.service';
 import config from '@/config';

packages/cli/src/controllers/me.controller.ts

@@ -4,12 +4,12 @@ import {
 	SettingsUpdateRequestDto,
 	UserUpdateRequestDto,
 } from '@n8n/api-types';
+import { Logger } from '@n8n/backend-common';
 import type { User, PublicUser } from '@n8n/db';
 import { UserRepository } from '@n8n/db';
 import { Body, Patch, Post, RestController } from '@n8n/decorators';
 import { plainToInstance } from 'class-transformer';
 import { Response } from 'express';
-import { Logger } from 'n8n-core';
 
 import { AuthService } from '@/auth/auth.service';
 import { BadRequestError } from '@/errors/response-errors/bad-request.error';

packages/cli/src/controllers/oauth/__tests__/oauth1-credential.controller.test.ts

@@ -1,3 +1,4 @@
+import { Logger } from '@n8n/backend-common';
 import type { CredentialsEntity } from '@n8n/db';
 import type { User } from '@n8n/db';
 import { CredentialsRepository } from '@n8n/db';
@@ -5,7 +6,7 @@ import { Container } from '@n8n/di';
 import Csrf from 'csrf';
 import type { Response } from 'express';
 import { captor, mock } from 'jest-mock-extended';
-import { Cipher, type InstanceSettings, Logger } from 'n8n-core';
+import { Cipher, type InstanceSettings } from 'n8n-core';
 import type { IWorkflowExecuteAdditionalData } from 'n8n-workflow';
 import nock from 'nock';
 

packages/cli/src/controllers/oauth/__tests__/oauth2-credential.controller.test.ts

@@ -1,3 +1,4 @@
+import { Logger } from '@n8n/backend-common';
 import type { CredentialsEntity } from '@n8n/db';
 import type { User } from '@n8n/db';
 import { CredentialsRepository } from '@n8n/db';
@@ -5,7 +6,7 @@ import { Container } from '@n8n/di';
 import Csrf from 'csrf';
 import { type Response } from 'express';
 import { captor, mock } from 'jest-mock-extended';
-import { Cipher, type InstanceSettings, Logger } from 'n8n-core';
+import { Cipher, type InstanceSettings } from 'n8n-core';
 import type { IWorkflowExecuteAdditionalData } from 'n8n-workflow';
 import nock from 'nock';
 

packages/cli/src/controllers/oauth/abstract-oauth.controller.ts

@@ -1,10 +1,11 @@
+import { Logger } from '@n8n/backend-common';
 import { GlobalConfig } from '@n8n/config';
 import type { CredentialsEntity, ICredentialsDb } from '@n8n/db';
 import { CredentialsRepository } from '@n8n/db';
 import { Service } from '@n8n/di';
 import Csrf from 'csrf';
 import type { Response } from 'express';
-import { Credentials, Logger } from 'n8n-core';
+import { Credentials } from 'n8n-core';
 import type { ICredentialDataDecryptedObject, IWorkflowExecuteAdditionalData } from 'n8n-workflow';
 import { jsonParse, UnexpectedError } from 'n8n-workflow';
 

packages/cli/src/controllers/owner.controller.ts

@@ -1,8 +1,8 @@
 import { DismissBannerRequestDto, OwnerSetupRequestDto } from '@n8n/api-types';
+import { Logger } from '@n8n/backend-common';
 import { SettingsRepository, UserRepository } from '@n8n/db';
 import { Body, GlobalScope, Post, RestController } from '@n8n/decorators';
 import { Response } from 'express';
-import { Logger } from 'n8n-core';
 
 import { AuthService } from '@/auth/auth.service';
 import config from '@/config';

packages/cli/src/controllers/password-reset.controller.ts

@@ -3,11 +3,11 @@ import {
 	ForgotPasswordRequestDto,
 	ResolvePasswordTokenQueryDto,
 } from '@n8n/api-types';
+import { Logger } from '@n8n/backend-common';
 import { UserRepository } from '@n8n/db';
 import { Body, Get, Post, Query, RestController } from '@n8n/decorators';
 import { hasGlobalScope } from '@n8n/permissions';
 import { Response } from 'express';
-import { Logger } from 'n8n-core';
 
 import { AuthService } from '@/auth/auth.service';
 import { RESPONSE_ERROR_MESSAGES } from '@/constants';

packages/cli/src/controllers/users.controller.ts

@@ -1,4 +1,5 @@
 import { RoleChangeRequestDto, SettingsUpdateRequestDto } from '@n8n/api-types';
+import { Logger } from '@n8n/backend-common';
 import type { PublicUser } from '@n8n/db';
 import {
 	Project,
@@ -20,7 +21,6 @@ import {
 	Param,
 } from '@n8n/decorators';
 import { Response } from 'express';
-import { Logger } from 'n8n-core';
 
 import { AuthService } from '@/auth/auth.service';
 import { CredentialsService } from '@/credentials/credentials.service';

packages/cli/src/controllers/workflow-statistics.controller.ts

@@ -1,8 +1,8 @@
+import { Logger } from '@n8n/backend-common';
 import type { WorkflowStatistics } from '@n8n/db';
 import { StatisticsNames, WorkflowStatisticsRepository } from '@n8n/db';
 import { Get, Middleware, RestController } from '@n8n/decorators';
 import { Response, NextFunction } from 'express';
-import { Logger } from 'n8n-core';
 
 import { NotFoundError } from '@/errors/response-errors/not-found.error';
 import type { IWorkflowStatisticsDataLoaded } from '@/interfaces';

packages/cli/src/crash-journal.ts

@@ -1,8 +1,8 @@
-import { inProduction } from '@n8n/backend-common';
+import { inProduction, Logger } from '@n8n/backend-common';
 import { Container } from '@n8n/di';
 import { existsSync } from 'fs';
 import { mkdir, utimes, open, rm } from 'fs/promises';
-import { InstanceSettings, Logger } from 'n8n-core';
+import { InstanceSettings } from 'n8n-core';
 import { sleep } from 'n8n-workflow';
 import { join, dirname } from 'path';
 

packages/cli/src/credentials-overwrites.ts

@@ -1,6 +1,6 @@
+import { Logger } from '@n8n/backend-common';
 import { GlobalConfig } from '@n8n/config';
 import { Service } from '@n8n/di';
-import { Logger } from 'n8n-core';
 import type { ICredentialDataDecryptedObject } from 'n8n-workflow';
 import { deepCopy, jsonParse } from 'n8n-workflow';
 

packages/cli/src/credentials/credentials.controller.ts

@@ -4,6 +4,7 @@ import {
 	CredentialsGetOneRequestQuery,
 	GenerateCredentialNameRequestQuery,
 } from '@n8n/api-types';
+import { Logger } from '@n8n/backend-common';
 import { GlobalConfig } from '@n8n/config';
 import { SharedCredentials, ProjectRelationRepository, SharedCredentialsRepository } from '@n8n/db';
 import {
@@ -21,7 +22,6 @@ import {
 } from '@n8n/decorators';
 // eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import
 import { In } from '@n8n/typeorm';
-import { Logger } from 'n8n-core';
 import { deepCopy } from 'n8n-workflow';
 import type { ICredentialDataDecryptedObject } from 'n8n-workflow';
 import { z } from 'zod';

packages/cli/src/credentials/credentials.service.ts

@@ -1,4 +1,5 @@
 import type { CreateCredentialDto } from '@n8n/api-types';
+import { Logger } from '@n8n/backend-common';
 import type { Project, User, ICredentialsDb, ScopesField } from '@n8n/db';
 import {
 	CredentialsEntity,
@@ -17,7 +18,7 @@ import {
 	type FindOptionsRelations,
 	type FindOptionsWhere,
 } from '@n8n/typeorm';
-import { CredentialDataError, Credentials, ErrorReporter, Logger } from 'n8n-core';
+import { CredentialDataError, Credentials, ErrorReporter } from 'n8n-core';
 import type {
 	ICredentialDataDecryptedObject,
 	ICredentialsDecrypted,

packages/cli/src/deprecation/__tests__/deprecation.service.test.ts

@@ -1,6 +1,6 @@
+import type { Logger } from '@n8n/backend-common';
 import { GlobalConfig } from '@n8n/config';
 import { captor, mock } from 'jest-mock-extended';
-import type { Logger } from 'n8n-core';
 
 import config from '@/config';
 import { mockInstance } from '@test/mocking';

packages/cli/src/deprecation/deprecation.service.ts

@@ -1,6 +1,6 @@
+import { Logger } from '@n8n/backend-common';
 import { GlobalConfig } from '@n8n/config';
 import { Service } from '@n8n/di';
-import { Logger } from 'n8n-core';
 
 import config from '@/config';
 

packages/cli/src/environments.ee/source-control/source-control-export.service.ee.ts

@@ -1,4 +1,5 @@
 import type { SourceControlledFile } from '@n8n/api-types';
+import { Logger } from '@n8n/backend-common';
 import type { IWorkflowDb } from '@n8n/db';
 import {
 	FolderRepository,
@@ -12,7 +13,7 @@ import { Service } from '@n8n/di';
 // eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import
 import { In } from '@n8n/typeorm';
 import { rmSync } from 'fs';
-import { Credentials, InstanceSettings, Logger } from 'n8n-core';
+import { Credentials, InstanceSettings } from 'n8n-core';
 import { UnexpectedError, type ICredentialDataDecryptedObject } from 'n8n-workflow';
 import { writeFile as fsWriteFile, rm as fsRm } from 'node:fs/promises';
 import path from 'path';

packages/cli/src/environments.ee/source-control/source-control-git.service.ee.ts

@@ -1,7 +1,7 @@
+import { Logger } from '@n8n/backend-common';
 import type { User } from '@n8n/db';
 import { Service } from '@n8n/di';
 import { execSync } from 'child_process';
-import { Logger } from 'n8n-core';
 import { UnexpectedError } from 'n8n-workflow';
 import path from 'path';
 import type {

packages/cli/src/environments.ee/source-control/source-control-helper.ee.ts

@@ -1,8 +1,8 @@
 import type { SourceControlledFile } from '@n8n/api-types';
+import { Logger } from '@n8n/backend-common';
 import { Container } from '@n8n/di';
 import { generateKeyPairSync } from 'crypto';
 import { constants as fsConstants, mkdirSync, accessSync } from 'fs';
-import { Logger } from 'n8n-core';
 import { UserError } from 'n8n-workflow';
 import { ok } from 'node:assert/strict';
 import path from 'path';

packages/cli/src/environments.ee/source-control/source-control-import.service.ee.ts

@@ -1,4 +1,5 @@
 import type { SourceControlledFile } from '@n8n/api-types';
+import { Logger } from '@n8n/backend-common';
 import type { Variables, Project, TagEntity, User, WorkflowTagMapping } from '@n8n/db';
 import {
 	SharedCredentials,
@@ -17,7 +18,7 @@ import { Service } from '@n8n/di';
 // eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import
 import { In } from '@n8n/typeorm';
 import glob from 'fast-glob';
-import { Credentials, ErrorReporter, InstanceSettings, Logger } from 'n8n-core';
+import { Credentials, ErrorReporter, InstanceSettings } from 'n8n-core';
 import { jsonParse, ensureError, UserError, UnexpectedError } from 'n8n-workflow';
 import { readFile as fsReadFile } from 'node:fs/promises';
 import path from 'path';

packages/cli/src/environments.ee/source-control/source-control-preferences.service.ee.ts

@@ -1,9 +1,10 @@
+import { Logger } from '@n8n/backend-common';
 import { SettingsRepository } from '@n8n/db';
 import { Service } from '@n8n/di';
 import type { ValidationError } from 'class-validator';
 import { validate } from 'class-validator';
 import { rm as fsRm } from 'fs/promises';
-import { Cipher, InstanceSettings, Logger } from 'n8n-core';
+import { Cipher, InstanceSettings } from 'n8n-core';
 import { jsonParse, UnexpectedError } from 'n8n-workflow';
 import { writeFile, chmod, readFile } from 'node:fs/promises';
 import path from 'path';

packages/cli/src/environments.ee/source-control/source-control.service.ee.ts

@@ -3,6 +3,7 @@ import type {
 	PushWorkFolderRequestDto,
 	SourceControlledFile,
 } from '@n8n/api-types';
+import { Logger } from '@n8n/backend-common';
 import {
 	type Variables,
 	type TagEntity,
@@ -13,7 +14,6 @@ import {
 import { Service } from '@n8n/di';
 import { hasGlobalScope } from '@n8n/permissions';
 import { writeFileSync } from 'fs';
-import { Logger } from 'n8n-core';
 import { UnexpectedError, UserError } from 'n8n-workflow';
 import path from 'path';
 import type { PushResult } from 'simple-git';

packages/cli/src/evaluation.ee/test-runner/test-run-cleanup.service.ee.ts

@@ -1,6 +1,6 @@
+import { Logger } from '@n8n/backend-common';
 import { TestRunRepository } from '@n8n/db';
 import { Service } from '@n8n/di';
-import { Logger } from 'n8n-core';
 
 /**
  * This service is responsible for cleaning up pending Test Runs on application startup.

packages/cli/src/evaluation.ee/test-runner/test-runner.service.ee.ts

@@ -1,7 +1,8 @@
+import { Logger } from '@n8n/backend-common';
 import type { User, TestRun } from '@n8n/db';
 import { TestCaseExecutionRepository, TestRunRepository, WorkflowRepository } from '@n8n/db';
 import { Service } from '@n8n/di';
-import { ErrorReporter, Logger } from 'n8n-core';
+import { ErrorReporter } from 'n8n-core';
 import {
 	EVALUATION_NODE_TYPE,
 	EVALUATION_TRIGGER_NODE_TYPE,

packages/cli/src/eventbus/message-event-bus-destination/message-event-bus-destination-from-db.ts

@@ -1,6 +1,6 @@
+import { Logger } from '@n8n/backend-common';
 import type { EventDestinations } from '@n8n/db';
 import { Container } from '@n8n/di';
-import { Logger } from 'n8n-core';
 import { MessageEventBusDestinationTypeNames } from 'n8n-workflow';
 
 import { MessageEventBusDestinationSentry } from './message-event-bus-destination-sentry.ee';

packages/cli/src/eventbus/message-event-bus-destination/message-event-bus-destination-syslog.ee.ts

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
+import { Logger } from '@n8n/backend-common';
 import { Container } from '@n8n/di';
-import { Logger } from 'n8n-core';
 import type {
 	MessageEventBusDestinationOptions,
 	MessageEventBusDestinationSyslogOptions,

packages/cli/src/eventbus/message-event-bus-destination/message-event-bus-destination.ee.ts

@@ -1,6 +1,6 @@
+import { Logger } from '@n8n/backend-common';
 import { EventDestinationsRepository } from '@n8n/db';
 import { Container } from '@n8n/di';
-import { Logger } from 'n8n-core';
 import type { INodeCredentials, MessageEventBusDestinationOptions } from 'n8n-workflow';
 import { MessageEventBusDestinationTypeNames } from 'n8n-workflow';
 import { v4 as uuid } from 'uuid';

packages/cli/src/eventbus/message-event-bus-writer/message-event-bus-log-writer.ts

@@ -1,12 +1,12 @@
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 
-import { inTest } from '@n8n/backend-common';
+import { inTest, Logger } from '@n8n/backend-common';
 import { GlobalConfig } from '@n8n/config';
 import { Container } from '@n8n/di';
 import { once as eventOnce } from 'events';
 import { createReadStream, existsSync, rmSync } from 'fs';
 import remove from 'lodash/remove';
-import { InstanceSettings, Logger } from 'n8n-core';
+import { InstanceSettings } from 'n8n-core';
 import { EventMessageTypeNames, jsonParse } from 'n8n-workflow';
 import path, { parse } from 'path';
 import readline from 'readline';

packages/cli/src/eventbus/message-event-bus/message-event-bus.ts

@@ -1,3 +1,4 @@
+import { Logger } from '@n8n/backend-common';
 import { GlobalConfig } from '@n8n/config';
 import { EventDestinationsRepository, ExecutionRepository, WorkflowRepository } from '@n8n/db';
 import { Service } from '@n8n/di';
@@ -7,7 +8,6 @@ import type { DeleteResult } from '@n8n/typeorm';
 import { In } from '@n8n/typeorm';
 import EventEmitter from 'events';
 import uniqby from 'lodash/uniqBy';
-import { Logger } from 'n8n-core';
 import type { MessageEventBusDestinationOptions } from 'n8n-workflow';
 
 import config from '@/config';

packages/cli/src/execution-lifecycle/__tests__/execution-lifecycle-hooks.test.ts

@@ -1,3 +1,4 @@
+import { Logger } from '@n8n/backend-common';
 import type { Project } from '@n8n/db';
 import { ExecutionRepository } from '@n8n/db';
 import { stringify } from 'flatted';
@@ -6,7 +7,6 @@ import {
 	BinaryDataService,
 	ErrorReporter,
 	InstanceSettings,
-	Logger,
 	ExecutionLifecycleHooks,
 	BinaryDataConfig,
 } from 'n8n-core';

packages/cli/src/execution-lifecycle/__tests__/save-execution-progress.test.ts

@@ -1,8 +1,8 @@
+import { Logger } from '@n8n/backend-common';
 import type { IExecutionResponse } from '@n8n/db';
 import { ExecutionRepository } from '@n8n/db';
 import { mock } from 'jest-mock-extended';
 import { ErrorReporter } from 'n8n-core';
-import { Logger } from 'n8n-core';
 import type { IRunExecutionData, ITaskData } from 'n8n-workflow';
 
 import { mockInstance } from '@test/mocking';

packages/cli/src/execution-lifecycle/execute-error-workflow.ts

@@ -1,6 +1,7 @@
+import { Logger } from '@n8n/backend-common';
 import { GlobalConfig } from '@n8n/config';
 import { Container } from '@n8n/di';
-import { ErrorReporter, Logger } from 'n8n-core';
+import { ErrorReporter } from 'n8n-core';
 import type { IRun, IWorkflowBase, WorkflowExecuteMode } from 'n8n-workflow';
 
 import type { IWorkflowErrorData } from '@/interfaces';

packages/cli/src/execution-lifecycle/execution-lifecycle-hooks.ts

@@ -1,7 +1,8 @@
+import { Logger } from '@n8n/backend-common';
 import { ExecutionRepository } from '@n8n/db';
 import { Container } from '@n8n/di';
 import { stringify } from 'flatted';
-import { ErrorReporter, Logger, InstanceSettings, ExecutionLifecycleHooks } from 'n8n-core';
+import { ErrorReporter, InstanceSettings, ExecutionLifecycleHooks } from 'n8n-core';
 import type {
 	IWorkflowBase,
 	WorkflowExecuteMode,

packages/cli/src/execution-lifecycle/restore-binary-data-id.ts

@@ -1,6 +1,7 @@
+import { Logger } from '@n8n/backend-common';
 import { Container } from '@n8n/di';
 import type { BinaryData } from 'n8n-core';
-import { BinaryDataConfig, BinaryDataService, Logger } from 'n8n-core';
+import { BinaryDataConfig, BinaryDataService } from 'n8n-core';
 import type { IRun, WorkflowExecuteMode } from 'n8n-workflow';
 
 /**

packages/cli/src/execution-lifecycle/save-execution-progress.ts

@@ -1,6 +1,7 @@
+import { Logger } from '@n8n/backend-common';
 import { ExecutionRepository } from '@n8n/db';
 import { Container } from '@n8n/di';
-import { ErrorReporter, Logger } from 'n8n-core';
+import { ErrorReporter } from 'n8n-core';
 import type { IRunExecutionData, ITaskData } from 'n8n-workflow';
 
 export async function saveExecutionProgress(

packages/cli/src/execution-lifecycle/shared/shared-hook-functions.ts

@@ -1,8 +1,8 @@
+import { Logger } from '@n8n/backend-common';
 import type { IExecutionDb } from '@n8n/db';
 import { ExecutionRepository } from '@n8n/db';
 import { Container } from '@n8n/di';
 import pick from 'lodash/pick';
-import { Logger } from 'n8n-core';
 import { ensureError, type ExecutionStatus, type IRun, type IWorkflowBase } from 'n8n-workflow';
 
 import type { UpdateExecutionPayload } from '@/interfaces';

packages/cli/src/executions/execution-recovery.service.ts

@@ -1,8 +1,9 @@
+import { Logger } from '@n8n/backend-common';
 import type { IExecutionResponse } from '@n8n/db';
 import { ExecutionRepository } from '@n8n/db';
 import { Service } from '@n8n/di';
 import type { DateTime } from 'luxon';
-import { InstanceSettings, Logger } from 'n8n-core';
+import { InstanceSettings } from 'n8n-core';
 import { sleep } from 'n8n-workflow';
 import type { IRun, ITaskData } from 'n8n-workflow';
 

packages/cli/src/executions/execution.service.ts

@@ -1,3 +1,4 @@
+import { Logger } from '@n8n/backend-common';
 import { GlobalConfig } from '@n8n/config';
 import type {
 	User,
@@ -14,7 +15,6 @@ import {
 } from '@n8n/db';
 import { Service } from '@n8n/di';
 import { validate as jsonSchemaValidate } from 'jsonschema';
-import { Logger } from 'n8n-core';
 import type {
 	ExecutionError,
 	ExecutionStatus,

packages/cli/src/executions/pre-execution-checks/subworkflow-policy-checker.ts

@@ -1,7 +1,7 @@
+import { Logger } from '@n8n/backend-common';
 import { GlobalConfig } from '@n8n/config';
 import type { Project } from '@n8n/db';
 import { Service } from '@n8n/di';
-import { Logger } from 'n8n-core';
 import { type Workflow, type INode, type WorkflowSettings } from 'n8n-workflow';
 
 import { SubworkflowPolicyDenialError } from '@/errors/subworkflow-policy-denial.error';

packages/cli/src/external-hooks.ts

@@ -1,4 +1,5 @@
 import type { FrontendSettings, UserUpdateRequestDto } from '@n8n/api-types';
+import { Logger } from '@n8n/backend-common';
 import type { ClientOAuth2Options } from '@n8n/client-oauth2';
 import { GlobalConfig } from '@n8n/config';
 import type { TagEntity, User, ICredentialsDb, PublicUser } from '@n8n/db';
@@ -9,7 +10,7 @@ import {
 	UserRepository,
 } from '@n8n/db';
 import { Service } from '@n8n/di';
-import { ErrorReporter, Logger } from 'n8n-core';
+import { ErrorReporter } from 'n8n-core';
 import type { IRun, IWorkflowBase, Workflow, WorkflowExecuteMode } from 'n8n-workflow';
 import { UnexpectedError } from 'n8n-workflow';
 import type clientOAuth1 from 'oauth-1.0a';

packages/cli/src/external-secrets.ee/external-secrets-manager.ee.ts

@@ -1,7 +1,8 @@
+import { Logger } from '@n8n/backend-common';
 import { SettingsRepository } from '@n8n/db';
 import { OnShutdown } from '@n8n/decorators';
 import { Service } from '@n8n/di';
-import { Cipher, Logger } from 'n8n-core';
+import { Cipher } from 'n8n-core';
 import { jsonParse, type IDataObject, ensureError, UnexpectedError } from 'n8n-workflow';
 
 import { EventService } from '@/events/event.service';

packages/cli/src/external-secrets.ee/providers/aws-secrets-manager.ts

@@ -1,6 +1,6 @@
 import { SecretsManager, type SecretsManagerClientConfig } from '@aws-sdk/client-secrets-manager';
+import { Logger } from '@n8n/backend-common';
 import { Container } from '@n8n/di';
-import { Logger } from 'n8n-core';
 import type { INodeProperties } from 'n8n-workflow';
 
 import { DOCS_HELP_NOTICE, EXTERNAL_SECRETS_NAME_REGEX } from '../constants';

packages/cli/src/external-secrets.ee/providers/azure-key-vault/azure-key-vault.ts

@@ -1,6 +1,6 @@
 import type { SecretClient } from '@azure/keyvault-secrets';
+import { Logger } from '@n8n/backend-common';
 import { Container } from '@n8n/di';
-import { Logger } from 'n8n-core';
 import { ensureError } from 'n8n-workflow';
 import type { INodeProperties } from 'n8n-workflow';
 

packages/cli/src/external-secrets.ee/providers/gcp-secrets-manager/gcp-secrets-manager.ts

@@ -1,6 +1,6 @@
 import type { SecretManagerServiceClient as GcpClient } from '@google-cloud/secret-manager';
+import { Logger } from '@n8n/backend-common';
 import { Container } from '@n8n/di';
-import { Logger } from 'n8n-core';
 import { ensureError, jsonParse, type INodeProperties } from 'n8n-workflow';
 
 import type {

packages/cli/src/external-secrets.ee/providers/vault.ts

@@ -1,7 +1,7 @@
+import { Logger } from '@n8n/backend-common';
 import { Container } from '@n8n/di';
 import type { AxiosInstance, AxiosResponse } from 'axios';
 import axios from 'axios';
-import { Logger } from 'n8n-core';
 import type { IDataObject, INodeProperties } from 'n8n-workflow';
 
 import { DOCS_HELP_NOTICE, EXTERNAL_SECRETS_NAME_REGEX } from '../constants';

packages/cli/src/help.ts

@@ -1,6 +1,6 @@
+import { Logger } from '@n8n/backend-common';
 import { Container } from '@n8n/di';
 import { Help } from '@oclif/core';
-import { Logger } from 'n8n-core';
 
 // oclif expects a default export
 // eslint-disable-next-line import/no-default-export

packages/cli/src/ldap.ee/ldap.service.ee.ts

@@ -1,3 +1,4 @@
+import { Logger } from '@n8n/backend-common';
 import type { LdapConfig } from '@n8n/constants';
 import { LDAP_FEATURE_NAME } from '@n8n/constants';
 import { SettingsRepository } from '@n8n/db';
@@ -7,7 +8,7 @@ import { Service } from '@n8n/di';
 import { QueryFailedError } from '@n8n/typeorm';
 import type { Entry as LdapUser, ClientOptions } from 'ldapts';
 import { Client } from 'ldapts';
-import { Cipher, Logger } from 'n8n-core';
+import { Cipher } from 'n8n-core';
 import { jsonParse, UnexpectedError } from 'n8n-workflow';
 import type { ConnectionOptions } from 'tls';
 

packages/cli/src/license.ts

@@ -1,4 +1,5 @@
 import type { LicenseProvider } from '@n8n/backend-common';
+import { Logger } from '@n8n/backend-common';
 import { GlobalConfig } from '@n8n/config';
 import {
 	LICENSE_FEATURES,
@@ -12,7 +13,7 @@ import { OnLeaderStepdown, OnLeaderTakeover, OnShutdown } from '@n8n/decorators'
 import { Container, Service } from '@n8n/di';
 import type { TEntitlement, TLicenseBlock } from '@n8n_io/license-sdk';
 import { LicenseManager } from '@n8n_io/license-sdk';
-import { InstanceSettings, Logger } from 'n8n-core';
+import { InstanceSettings } from 'n8n-core';
 
 import config from '@/config';
 import { LicenseMetricsService } from '@/metrics/license-metrics.service';

packages/cli/src/license/license.service.ts

@@ -1,9 +1,8 @@
-import { LicenseState } from '@n8n/backend-common';
+import { LicenseState, Logger } from '@n8n/backend-common';
 import type { User } from '@n8n/db';
 import { WorkflowRepository } from '@n8n/db';
 import { Service } from '@n8n/di';
 import axios, { AxiosError } from 'axios';
-import { Logger } from 'n8n-core';
 import { ensureError } from 'n8n-workflow';
 
 import { BadRequestError } from '@/errors/response-errors/bad-request.error';

packages/cli/src/load-nodes-and-credentials.ts

@@ -1,4 +1,4 @@
-import { inTest } from '@n8n/backend-common';
+import { inTest, Logger } from '@n8n/backend-common';
 import { GlobalConfig } from '@n8n/config';
 import { Container, Service } from '@n8n/di';
 import glob from 'fast-glob';
@@ -13,7 +13,6 @@ import {
 	LazyPackageDirectoryLoader,
 	UnrecognizedCredentialTypeError,
 	UnrecognizedNodeTypeError,
-	Logger,
 } from 'n8n-core';
 import type {
 	KnownNodesAndCredentials,

packages/cli/src/manual-execution.service.ts

@@ -1,3 +1,4 @@
+import { Logger } from '@n8n/backend-common';
 import { Service } from '@n8n/di';
 import * as a from 'assert/strict';
 import {
@@ -5,7 +6,6 @@ import {
 	filterDisabledNodes,
 	recreateNodeExecutionStack,
 	WorkflowExecute,
-	Logger,
 	isTool,
 	rewireGraph,
 } from 'n8n-core';

packages/cli/src/modules/insights/__tests__/insights.module.test.ts

@@ -1,5 +1,5 @@
+import type { Logger } from '@n8n/backend-common';
 import { InstanceSettings } from 'n8n-core';
-import type { Logger } from 'n8n-core';
 
 import { mockInstance, mockLogger } from '@test/mocking';
 

packages/cli/src/modules/insights/insights-collection.service.ts

@@ -1,9 +1,9 @@
+import { Logger } from '@n8n/backend-common';
 import { SharedWorkflowRepository } from '@n8n/db';
 import { OnLifecycleEvent, type WorkflowExecuteAfterContext } from '@n8n/decorators';
 import { Service } from '@n8n/di';
 import { In } from '@n8n/typeorm';
 import { DateTime } from 'luxon';
-import { Logger } from 'n8n-core';
 import { UnexpectedError, type ExecutionStatus, type WorkflowExecuteMode } from 'n8n-workflow';
 
 import { InsightsMetadata } from '@/modules/insights/database/entities/insights-metadata';

packages/cli/src/modules/insights/insights-compaction.service.ts

@@ -1,5 +1,5 @@
+import { Logger } from '@n8n/backend-common';
 import { Service } from '@n8n/di';
-import { Logger } from 'n8n-core';
 
 import { InsightsByPeriodRepository } from './database/repositories/insights-by-period.repository';
 import { InsightsRawRepository } from './database/repositories/insights-raw.repository';

packages/cli/src/modules/insights/insights-pruning.service.ts

@@ -1,7 +1,6 @@
-import { LicenseState } from '@n8n/backend-common';
+import { LicenseState, Logger } from '@n8n/backend-common';
 import { Service } from '@n8n/di';
 import { strict } from 'assert';
-import { Logger } from 'n8n-core';
 
 import { Time } from '@/constants';
 

packages/cli/src/modules/insights/insights.module.ts

@@ -1,6 +1,7 @@
+import { Logger } from '@n8n/backend-common';
 import type { BaseN8nModule } from '@n8n/decorators';
 import { N8nModule, OnLeaderStepdown, OnLeaderTakeover } from '@n8n/decorators';
-import { InstanceSettings, Logger } from 'n8n-core';
+import { InstanceSettings } from 'n8n-core';
 
 import { InsightsService } from './insights.service';
 

packages/cli/src/modules/insights/insights.service.ts

@@ -3,10 +3,9 @@ import {
 	type InsightsDateRange,
 	INSIGHTS_DATE_RANGE_KEYS,
 } from '@n8n/api-types';
-import { LicenseState } from '@n8n/backend-common';
+import { LicenseState, Logger } from '@n8n/backend-common';
 import { OnShutdown } from '@n8n/decorators';
 import { Service } from '@n8n/di';
-import { Logger } from 'n8n-core';
 import { UserError } from 'n8n-workflow';
 
 import type { PeriodUnit, TypeUnit } from './database/entities/insights-shared';

packages/cli/src/push/__tests__/index.test.ts

@@ -1,7 +1,7 @@
+import type { Logger } from '@n8n/backend-common';
 import type { User } from '@n8n/db';
 import type { Application } from 'express';
 import { captor, mock } from 'jest-mock-extended';
-import type { Logger } from 'n8n-core';
 import type { Server, ServerResponse } from 'node:http';
 import type { Socket } from 'node:net';
 import { type WebSocket, Server as WSServer } from 'ws';

packages/cli/src/push/__tests__/websocket.push.test.ts

@@ -1,8 +1,8 @@
 import { createHeartbeatMessage, type PushMessage } from '@n8n/api-types';
+import { Logger } from '@n8n/backend-common';
 import type { User } from '@n8n/db';
 import { Container } from '@n8n/di';
 import { EventEmitter } from 'events';
-import { Logger } from 'n8n-core';
 import type WebSocket from 'ws';
 
 import { WebSocketPush } from '@/push/websocket.push';

packages/cli/src/push/abstract.push.ts

@@ -1,7 +1,8 @@
 import type { PushMessage } from '@n8n/api-types';
+import { Logger } from '@n8n/backend-common';
 import type { User } from '@n8n/db';
 import { Service } from '@n8n/di';
-import { ErrorReporter, Logger } from 'n8n-core';
+import { ErrorReporter } from 'n8n-core';
 import { assert, jsonStringify } from 'n8n-workflow';
 
 import type { OnPushMessage } from '@/push/types';

packages/cli/src/push/index.ts

@@ -1,5 +1,5 @@
 import type { PushMessage } from '@n8n/api-types';
-import { inProduction } from '@n8n/backend-common';
+import { inProduction, Logger } from '@n8n/backend-common';
 import type { User } from '@n8n/db';
 import { OnShutdown } from '@n8n/decorators';
 import { Container, Service } from '@n8n/di';
@@ -7,7 +7,7 @@ import type { Application } from 'express';
 import { ServerResponse } from 'http';
 import type { Server } from 'http';
 import { pick } from 'lodash';
-import { InstanceSettings, Logger } from 'n8n-core';
+import { InstanceSettings } from 'n8n-core';
 import { deepCopy } from 'n8n-workflow';
 import { parse as parseUrl } from 'url';
 import { Server as WSServer } from 'ws';

packages/cli/src/response-helper.ts

@@ -1,8 +1,8 @@
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
-import { inDevelopment } from '@n8n/backend-common';
+import { inDevelopment, Logger } from '@n8n/backend-common';
 import { Container } from '@n8n/di';
 import type { Request, Response } from 'express';
-import { ErrorReporter, Logger } from 'n8n-core';
+import { ErrorReporter } from 'n8n-core';
 import { FORM_TRIGGER_PATH_IDENTIFIER, NodeApiError } from 'n8n-workflow';
 import { Readable } from 'node:stream';
 import picocolors from 'picocolors';

packages/cli/src/scaling/__tests__/job-processor.service.test.ts

@@ -1,8 +1,8 @@
+import type { Logger } from '@n8n/backend-common';
 import type { IExecutionResponse } from '@n8n/db';
 import type { ExecutionRepository } from '@n8n/db';
 import { mock } from 'jest-mock-extended';
 import type { WorkflowExecute as ActualWorkflowExecute } from 'n8n-core';
-import { type Logger } from 'n8n-core';
 import { mockInstance } from 'n8n-core/test/utils';
 import type { IPinData, ITaskData, IWorkflowExecuteAdditionalData } from 'n8n-workflow';
 import { Workflow, type IRunExecutionData, type WorkflowExecuteMode } from 'n8n-workflow';

packages/cli/src/scaling/job-processor.ts

@@ -1,7 +1,8 @@
 import type { RunningJobSummary } from '@n8n/api-types';
+import { Logger } from '@n8n/backend-common';
 import { ExecutionRepository, WorkflowRepository } from '@n8n/db';
 import { Service } from '@n8n/di';
-import { WorkflowHasIssuesError, InstanceSettings, WorkflowExecute, Logger } from 'n8n-core';
+import { WorkflowHasIssuesError, InstanceSettings, WorkflowExecute } from 'n8n-core';
 import type {
 	ExecutionStatus,
 	IExecuteResponsePromiseData,

packages/cli/src/scaling/multi-main-setup.ee.ts

@@ -1,7 +1,8 @@
+import { Logger } from '@n8n/backend-common';
 import { GlobalConfig } from '@n8n/config';
 import { MultiMainMetadata } from '@n8n/decorators';
 import { Container, Service } from '@n8n/di';
-import { InstanceSettings, Logger } from 'n8n-core';
+import { InstanceSettings } from 'n8n-core';
 
 import config from '@/config';
 import { Time } from '@/constants';

packages/cli/src/scaling/pubsub/publisher.service.ts

@@ -1,6 +1,7 @@
+import { Logger } from '@n8n/backend-common';
 import { Service } from '@n8n/di';
 import type { Redis as SingleNodeClient, Cluster as MultiNodeClient } from 'ioredis';
-import { InstanceSettings, Logger } from 'n8n-core';
+import { InstanceSettings } from 'n8n-core';
 import type { LogMetadata } from 'n8n-workflow';
 
 import config from '@/config';

packages/cli/src/scaling/pubsub/subscriber.service.ts

@@ -1,7 +1,8 @@
+import { Logger } from '@n8n/backend-common';
 import { Service } from '@n8n/di';
 import type { Redis as SingleNodeClient, Cluster as MultiNodeClient } from 'ioredis';
 import debounce from 'lodash/debounce';
-import { InstanceSettings, Logger } from 'n8n-core';
+import { InstanceSettings } from 'n8n-core';
 import { jsonParse } from 'n8n-workflow';
 import type { LogMetadata } from 'n8n-workflow';
 

packages/cli/src/scaling/scaling.service.ts

@@ -1,9 +1,9 @@
-import { isObjectLiteral } from '@n8n/backend-common';
+import { isObjectLiteral, Logger } from '@n8n/backend-common';
 import { GlobalConfig } from '@n8n/config';
 import { ExecutionRepository } from '@n8n/db';
 import { OnLeaderStepdown, OnLeaderTakeover, OnShutdown } from '@n8n/decorators';
 import { Container, Service } from '@n8n/di';
-import { ErrorReporter, InstanceSettings, Logger } from 'n8n-core';
+import { ErrorReporter, InstanceSettings } from 'n8n-core';
 import {
 	BINARY_ENCODING,
 	sleep,

packages/cli/src/scaling/worker-server.ts

@@ -1,8 +1,9 @@
+import { Logger } from '@n8n/backend-common';
 import { GlobalConfig } from '@n8n/config';
 import { Service } from '@n8n/di';
 import type { Application } from 'express';
 import express from 'express';
-import { InstanceSettings, Logger } from 'n8n-core';
+import { InstanceSettings } from 'n8n-core';
 import { strict as assert } from 'node:assert';
 import http from 'node:http';
 import type { Server } from 'node:http';

packages/cli/src/security-audit/risk-reporters/instance-risk-reporter.ts

@@ -1,9 +1,9 @@
-import { inDevelopment } from '@n8n/backend-common';
+import { inDevelopment, Logger } from '@n8n/backend-common';
 import { GlobalConfig } from '@n8n/config';
 import { separate } from '@n8n/db';
 import { Service } from '@n8n/di';
 import axios from 'axios';
-import { InstanceSettings, Logger } from 'n8n-core';
+import { InstanceSettings } from 'n8n-core';
 import type { IWorkflowBase } from 'n8n-workflow';
 
 import config from '@/config';

packages/cli/src/services/__tests__/community-packages.service.test.ts

@@ -1,3 +1,4 @@
+import type { Logger } from '@n8n/backend-common';
 import type { GlobalConfig } from '@n8n/config';
 import { LICENSE_FEATURES } from '@n8n/constants';
 import { InstalledNodes } from '@n8n/db';
@@ -9,7 +10,7 @@ import { exec } from 'child_process';
 import { mkdir, readFile, writeFile, rm, access, constants } from 'fs/promises';
 import { mocked } from 'jest-mock';
 import { mock } from 'jest-mock-extended';
-import type { Logger, InstanceSettings, PackageDirectoryLoader } from 'n8n-core';
+import type { InstanceSettings, PackageDirectoryLoader } from 'n8n-core';
 import type { PublicInstalledPackage } from 'n8n-workflow';
 import { join } from 'node:path';
 

packages/cli/src/services/active-workflows.service.ts

@@ -1,8 +1,8 @@
+import { Logger } from '@n8n/backend-common';
 import type { User } from '@n8n/db';
 import { SharedWorkflowRepository, WorkflowRepository } from '@n8n/db';
 import { Service } from '@n8n/di';
 import { hasGlobalScope } from '@n8n/permissions';
-import { Logger } from 'n8n-core';
 
 import { ActivationErrorsService } from '@/activation-errors.service';
 import { BadRequestError } from '@/errors/response-errors/bad-request.error';

packages/cli/src/services/community-node-types.service.ts

@@ -1,7 +1,7 @@
 import type { CommunityNodeType } from '@n8n/api-types';
+import { Logger } from '@n8n/backend-common';
 import { GlobalConfig } from '@n8n/config';
 import { Service } from '@n8n/di';
-import { Logger } from 'n8n-core';
 import { ensureError, type INodeTypeDescription } from 'n8n-workflow';
 
 import { CommunityPackagesService } from './community-packages.service';

packages/cli/src/services/community-packages.service.ts

@@ -1,3 +1,4 @@
+import { Logger } from '@n8n/backend-common';
 import { GlobalConfig } from '@n8n/config';
 import { LICENSE_FEATURES } from '@n8n/constants';
 import type { InstalledPackages } from '@n8n/db';
@@ -7,7 +8,7 @@ import axios from 'axios';
 import { exec } from 'child_process';
 import { access, constants, mkdir, readFile, rm, writeFile } from 'fs/promises';
 import type { PackageDirectoryLoader } from 'n8n-core';
-import { InstanceSettings, Logger } from 'n8n-core';
+import { InstanceSettings } from 'n8n-core';
 import { jsonParse, UnexpectedError, UserError, type PublicInstalledPackage } from 'n8n-workflow';
 import { join } from 'path';
 import { promisify } from 'util';

packages/cli/src/services/credentials-tester.service.ts

@@ -3,17 +3,11 @@
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/no-unsafe-return */
 /* eslint-disable @typescript-eslint/no-unsafe-call */
-import { isObjectLiteral } from '@n8n/backend-common';
+import { Logger, isObjectLiteral } from '@n8n/backend-common';
 import type { User } from '@n8n/db';
 import { Service } from '@n8n/di';
 import get from 'lodash/get';
-import {
+import { CredentialTestContext, ErrorReporter, ExecuteContext, RoutingNode } from 'n8n-core';
-	CredentialTestContext,
-	ErrorReporter,
-	ExecuteContext,
-	Logger,
-	RoutingNode,
-} from 'n8n-core';
 import type {
 	ICredentialsDecrypted,
 	ICredentialTestFunction,

packages/cli/src/services/frontend.service.ts

@@ -1,12 +1,12 @@
 import type { FrontendSettings, ITelemetrySettings } from '@n8n/api-types';
-import { LicenseState } from '@n8n/backend-common';
+import { LicenseState, Logger } from '@n8n/backend-common';
 import { GlobalConfig, SecurityConfig } from '@n8n/config';
 import { LICENSE_FEATURES } from '@n8n/constants';
 import { Container, Service } from '@n8n/di';
 import { createWriteStream } from 'fs';
 import { mkdir } from 'fs/promises';
 import uniq from 'lodash/uniq';
-import { BinaryDataConfig, InstanceSettings, Logger } from 'n8n-core';
+import { BinaryDataConfig, InstanceSettings } from 'n8n-core';
 import type { ICredentialType, INodeTypeBaseDescription } from 'n8n-workflow';
 import path from 'path';