Rebase a pull request that is behind main, instead of retrying it for an hour #148

Merged

nectenda-agent merged 1 commit from worktree-queue-outdated-fix into main 2026-09-24 15:31:18 +01:00

Conversation 0 Commits 1 Files changed 2 +60 -10

nectenda-agent commented 2026-09-24 15:03:16 +01:00

Collaborator

Copy link

The merge queue never rebased an outdated PR. It trusted pr.base.sha, which Forgejo reports as the base branch's current tip, so every PR looked up to date. NEC-49 (#143) was refused as "behind the base branch" every 2 minutes for an hour, blocking the queue.

• Up to date means merge_base === main head, nothing else.
• An "outdated" merge refusal leads to a rebase.
• Any other refusal is retried at most 3 ticks, then the card goes to Blocked and the queue moves on.
• The test fake now behaves like Forgejo; the old code fails two tests against it. All three rules were mutation-checked.

Changelog

NONE

The merge queue never rebased an outdated PR. It trusted `pr.base.sha`, which Forgejo reports as the base branch's current tip, so every PR looked up to date. NEC-49 (#143) was refused as "behind the base branch" every 2 minutes for an hour, blocking the queue. - Up to date means `merge_base === main head`, nothing else. - An "outdated" merge refusal leads to a rebase. - Any other refusal is retried at most 3 ticks, then the card goes to Blocked and the queue moves on. - The test fake now behaves like Forgejo; the old code fails two tests against it. All three rules were mutation-checked. ## Changelog NONE

nectenda-agent added the

area:ops

label 2026-09-24 15:03:16 +01:00

nectenda-agent added 1 commit 2026-09-24 15:03:16 +01:00

Rebase a pull request that is behind main, instead of retrying it for an hour ... 1d106bb0f4

The merge queue decided a pull request was up to date if its merge base
or its `base.sha` matched main's head. Forgejo reports the base branch's
*current tip* as `base.sha`, so that half was always true: the queue
never rebased, and retried a merge that Forgejo refused as "behind the
base branch" every two minutes. NEC-49 (PR #143) sat like that for an
hour, and everything behind it waited.

The tests did not catch it because their fake pull request had
`base: { sha: 'x' }`. It modelled what I assumed Forgejo returns, not
what it does. The fake now reports main's tip there and refuses an
outdated merge with Forgejo's own message, and against it the old
check fails two tests.

- Up to date is `merge_base === main's head`, and nothing else.
- A merge refused as outdated (main moved between the check and the
  merge) is rebased, not retried.
- Any other refusal is retried at most three ticks running, then the
  card goes to Blocked with the message and the queue moves on. A loop
  that only writes to a log is how this went unnoticed.

Each rule was broken once to see its test fail.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_015k9tkUtbU3wBpCHAHq7Qas

cruelacid force-pushed worktree-queue-outdated-fix from 1d106bb0f4 to 868358c717 2026-09-24 15:22:57 +01:00 Compare

nectenda-agent merged commit 868358c717 into main 2026-09-24 15:31:18 +01:00

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels   

area:docs

docs/

  

area:identity

packages/identity

  

area:ops

deploy/, CI, hosting

  

area:plugin

packages/plugin

  

area:server

packages/server

  

channel:community

Obsidian forum, Obsidian Discord, Reddit

  

channel:direct

Cold outreach to named firms

  

channel:owned

nectenda.com pages, the feedback board

  

channel:press

Hacker News, newsletters, outlets, YouTube creators

  

channel:social

Bluesky, Mastodon, X, YouTube accounts

  

e2ee-constrained

End-to-end encryption changes the shape of the answer

  

gate:at-ga

Held until Gates A-C close and terms/privacy leave DRAFT

  

gate:pre-ga

Safe to do before the launch gates close

  

marketing

Reach and positioning; work published off nectenda.com

  

parity

Relay feature-parity programme

  

relay:absent

4 - Not supported, not requested, not planned at Relay

  

relay:planned

2 - On Relay's roadmap (Active/Planned) or has an open PR

  

relay:requested

3 - Asked for by Relay users or under 'Considering'; not committed

  

relay:supported

1 - Relay ships this today

  

risk:additive

New message type, table or column; backward compatible

  

risk:contract

Changes something existing accounts or stored data depend on

  

risk:none

Client-only; the server is untouched

  

usability

How the product is understood and learned, not what it does

No labels

area:docs

area:identity

area:ops

area:plugin

area:server

channel:community

channel:direct

channel:owned

channel:press

channel:social

e2ee-constrained

gate:at-ga

gate:pre-ga

marketing

parity

relay:absent

relay:planned

relay:requested

relay:supported

risk:additive

risk:contract

risk:none

usability

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

2 participants

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set

Reference

Nectenda/nectenda!148

No description provided.