chore: Resolve master→3.x sync conflict

[n8n-assistant]

Automated master→3.x sync hit a conflict.

3.x was not touched. This branch is master merged into 3.x with the conflicts committed exactly as git left them — conflict markers included — so you can see what clashed. The required checks stay red until they are resolved, so this PR cannot be merged half-done.

How to resolve

1. git fetch origin sync/master-to-3x && git switch sync/master-to-3x
2. Resolve everything listed below and commit it in one commit of your own (rather than amending the merge).
3. git push origin sync/master-to-3x
4. Merge this PR with the normal merge button. master's commits come in as-is and your fix stays its own commit — nothing is squashed. Never close this PR unmerged: closing resolves nothing and the same conflict reopens on the next sync.

Daily syncs are paused until this PR is merged. The next sync then replays 3.x onto master linearly again — which also drops this merge commit and its markers out of 3.x's history — and verifies the result is exactly what a merge would produce.

Conflicted files

• packages/cli/src/workflow-runner.ts
  • master: 8272a8bc33 feat(core): Add project-level worker pools (no-changelog) (feat(core): Add project-level worker pools (no-changelog) #32975) — @Flexicon

Deleted on one side, changed on the other

Git leaves no conflict markers for these, so the branch looks clean where it is not — the merge kept 3.x's side. Decide whether that is right, and whether the other side's change has to be carried over (onto a re-recorded or renamed replacement file, typically):

• packages/node-dev/eslint.config.mjs — deleted on 3.x, changed on master; the merge kept 3.x's deletion
  • master: 44d9d908b2 feat(core): Add encryption usage guardrails (no-changelog) (feat(core): Add encryption usage guardrails (no-changelog) #37728) — @sychovSaveliy
• packages/node-dev/package.json — deleted on 3.x, changed on master; the merge kept 3.x's deletion
  • master: 44d9d908b2 feat(core): Add encryption usage guardrails (no-changelog) (feat(core): Add encryption usage guardrails (no-changelog) #37728) — @sychovSaveliy

Note

pnpm-lock.yaml still carries its conflict markers because a manifest (package.json / pnpm-workspace.yaml) is conflicted too, or its regeneration failed. After resolving the manifests, regenerate it with pnpm install --lockfile-only and commit the result.

Likely owners

Authors of the 3.x commits behind the conflicted files — nobody is requested as a reviewer, so pick this up between yourselves:

• @Flexicon
• @yehorkardash

[codecov]

Codecov Report

❌ Patch coverage is 82.41525% with 166 lines in your changes missing coverage. Please review.

Files with missing lines	Patch %	Lines
...kflow-sdk/src/generate-types/schema-harvest-cli.ts	0.00%	20 Missing ⚠️
.../workflow-sdk/src/generate-types/schema-harvest.ts	85.43%	4 Missing and 11 partials ⚠️
.../agents/background/agent-background-job.service.ts	84.61%	6 Missing and 8 partials ⚠️
...n8n/instance-ai/src/tools/workflows/setup-items.ts	84.00%	3 Missing and 9 partials ⚠️
...flow-sdk/src/generate-types/schema-coverage-cli.ts	0.00%	11 Missing ⚠️
...slint-config/src/rules/no-deployment-key-delete.ts	86.15%	2 Missing and 7 partials ⚠️
...config/src/rules/no-misplaced-cipher-primitives.ts	80.95%	2 Missing and 6 partials ⚠️
...ts/repositories/agent-background-job.repository.ts	0.00%	7 Missing ⚠️
...c/modules/agents/json-config/mcp-client-factory.ts	68.42%	3 Missing and 3 partials ⚠️
...ges/@n8n/cli/src/commands/package/package-error.ts	16.66%	4 Missing and 1 partial ⚠️
... and 27 more

📢 Thoughts on this report? Let us know!