chore(core): Merge current master into worker-pools (no-changelog) - #37634
Merged
Conversation
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Merges
origin/master(5aeb96cdb92, 2026-09-02) into the worker-pools branch, which was reset to the last reviewed state (5be3ebe127e, June 25).11 conflicts, resolved as follows:
Unions (both sides added different things to the same list): entity exports in
entities/index.ts(ProjectPoolSettings+ master'sScheduledJob/ScheduledTask), the two generatedprojectschema docs (project_pool_settings+ master'stype_availability_policy_scopeFKs), the permissions snapshot (orchestration:manage), the frontend-settings test default (queue.workerPool), andconstants.ee.ts(keep ourorchestration: managescope, keep master's newprojectscopes).workflow-runner.ts:jobDatagets both ourpoolNameand master'sencryptedRunnerIdentity. Our branch had hoisted master's lazyScalingServiceinit to the top ofenqueueExecution(pool resolution needs it first), so master's copy of that block at the old position is dropped; master's.jsimport-extension change is carried into the hoisted block.settings.store.ts(moved on master to@n8n/stores): keep ourisWorkerPoolsEnabled; drop the June-eraisAgentsNodeToolsFeatureEnabledcode that master has since removed (it appeared on our side of the hunk only as bystander context).Migrations (modify/delete): master deleted the per-DB
migrations/*/index.tsregistries; deletions accepted, and the worker-pools migration moved tocommon/1788254018000-CreateProjectPoolSettings.tsso it sorts after master's newest (1788191436461).Adaptations to master conventions, inside the merge:
ensureErrornow imported from@n8n/utils/errors/ensure-error(no longer exported byn8n-workflow), the four worker-pools cli test files moved from jest to vitest (cli migrated since June), andProjectPoolSettingsregistered inownership-transfer.manifest.json(that manifest landed on master after June).Cross-check: the merged tree was diffed against the previously verified merged state (
be3869a5b5f, see closed #37590–#37592). Excluding files master itself changed in the interim, the only differences are two deliberate ones:isWorkerPoolsEnableduses the reviewed=== truespelling (behavior-identical to?? false), and the orchestration-controller import member order follows current master.Merge instructions: do not squash this PR — squashing flattens the merge commit and detaches the branch from master's history. Merge with a merge commit, or fast-forward push the head SHA after approval.
How to test
CI must pass. To inspect the conflict resolutions locally:
git show cae850a4353shows the merge with its conflict list;git diff 5aeb96cdb92 cae850a4353shows the full worker-pools delta relative to master.Related Linear tickets, Github issues, and Community forum posts
Parent PR: #32975
Review / Merge checklist
Backport to Beta,Backport to Stable, orBackport to v1(if the PR is an urgent fix that needs to be backported)🤖 PR Summary generated by AI