Skip to content

chore(core): Merge current master into worker-pools (no-changelog) - #37634

Merged
mfsiega merged 2573 commits into
hackmation/worker-poolsfrom
merge/worker-pools-master
Sep 2, 2026
Merged

chore(core): Merge current master into worker-pools (no-changelog)#37634
mfsiega merged 2573 commits into
hackmation/worker-poolsfrom
merge/worker-pools-master

Conversation

@mfsiega

@mfsiega mfsiega commented Sep 2, 2026

Copy link
Copy Markdown
Contributor

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's ScheduledJob/ScheduledTask), the two generated project schema docs (project_pool_settings + master's type_availability_policy_scope FKs), the permissions snapshot (orchestration:manage), the frontend-settings test default (queue.workerPool), and constants.ee.ts (keep our orchestration: manage scope, keep master's new project scopes).

workflow-runner.ts: jobData gets both our poolName and master's encryptedRunnerIdentity. Our branch had hoisted master's lazy ScalingService init to the top of enqueueExecution (pool resolution needs it first), so master's copy of that block at the old position is dropped; master's .js import-extension change is carried into the hoisted block.

settings.store.ts (moved on master to @n8n/stores): keep our isWorkerPoolsEnabled; drop the June-era isAgentsNodeToolsFeatureEnabled code 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.ts registries; deletions accepted, and the worker-pools migration moved to common/1788254018000-CreateProjectPoolSettings.ts so it sorts after master's newest (1788191436461).

Adaptations to master conventions, inside the merge: ensureError now imported from @n8n/utils/errors/ensure-error (no longer exported by n8n-workflow), the four worker-pools cli test files moved from jest to vitest (cli migrated since June), and ProjectPoolSettings registered in ownership-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: isWorkerPoolsEnabled uses the reviewed === true spelling (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 cae850a4353 shows the merge with its conflict list; git diff 5aeb96cdb92 cae850a4353 shows the full worker-pools delta relative to master.

Related Linear tickets, Github issues, and Community forum posts

Parent PR: #32975

Review / Merge checklist

  • I have seen this code, I have run this code, and I take responsibility for this code.
  • PR title and summary are descriptive. (conventions)
  • Docs updated or follow-up ticket created.
  • Tests included.
  • PR Labeled with Backport to Beta, Backport to Stable, or Backport to v1 (if the PR is an urgent fix that needs to be backported)

🤖 PR Summary generated by AI

Review in cubic

Loading
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cla-signed n8n team Authored by the n8n team

Projects

None yet

Development

Successfully merging this pull request may close these issues.