charles/claude-hooks

Fork

You've already forked claude-hooks

Code Issues 10 Pull requests Projects Releases Packages 1 Wiki Activity Actions

Janitor rule: dispatch rebase for unmergeable open PRs (closes the no-event gap) #781

New issue

Closed

opened 2026-05-02 22:16:41 +00:00 by claude-desktop · 0 comments

claude-desktop commented

2026-05-02 22:16:41 +00:00

Collaborator

Copy link

User story

As an operator, I want unmergeable open PRs whose author is a configured agent to be auto-rebased even when no triggering webhook fires, so that a long-lived PR doesn't sit stuck after main moves on under it.

Background

Forgejo fires no event when a PR's mergeable flips to false. We currently close that loop in two places:

handlePostMergeRebase (apps/server/src/domain/workflow/event-handlers.ts:1069) — runs on pull_request closed && merged=true and walks siblings on the same base.
pr-changes-requested-graph.json mergeable_route — routes a not_mergeable arm when a reviewer requests changes.

Gaps both miss:

A push to main outside the PR-merge path (release tags, manual fast-forward, force push).
A PR that becomes unmergeable but no review activity follows.
The post-merge sibling sweep is best-effort: a transient API failure or a dedup-window collision skips the rebase silently.

Operator observation 2026-05-03: rebase agents not triggered "at least not all the time" on conflicts.

Proposed fix

Add a janitor rule unmergeable_pr_rebase in apps/server/src/background/janitor.ts:

List open PRs per configured repo.
For each: fetch detail, check mergeable === false.
Resolve author via resolveAgentByUser; skip non-agent authors.
Honour pr_dependencies — same three-way routing as handlePostMergeRebase (skip if PR declares parents that haven't merged).
Reuse the existing post-merge dedup map + markPostMergeRebaseDispatched so a janitor pass and an event-driven pass can't double-dispatch.
Dispatch using the same skillForEvent("rebase") + buildAgentRequest + dispatchByType path as handlePostMergeRebase.

Acceptance criteria

Janitor rule

New rule unmergeable_pr_rebase registered in _ALL_RULES and reconcileOnce
Lists open PRs per repo via impl.listOpenPullRequests
Skips PRs whose detail.mergeable !== false
Skips PRs whose author isn't a configured agent
Honours pr_dependencies markers (skip if declared parents are still open)
Dispatches rebase via the shared dispatchByType("rebase") path

Dedup

Re-uses the same _postMergeRebaseDispatched map keyed on repo#pr@sha
Janitor + event-driven path can't double-dispatch within the 10-minute window
alreadyDispatchedPostMergeRebase is exported and consumed by the rule

Idempotency

Janitor's per-rule canAct window also gates the rule (defence in depth)
markActed("unmergeable_pr_rebase", repo, "PR#N") after dispatch

Tests

Unit: rule dispatches when mergeable=false + agent author + no parents
Unit: rule skips when mergeable=true
Unit: rule skips when author isn't a configured agent
Unit: rule skips when PR declares an unmerged parent (B13 routing)
Unit: dedup map blocks double-dispatch when post-merge already fired
just qa clean

Out of scope

Push-to-base webhook hook (could later replace the periodic sweep — separate ticket).
Watchdog re-run of the rebase task itself (already handled by tail-pr-rebase-watchdog).
Stacked-rebase cascade (already covered by handleStackedRebaseCascade).

References

Hook gap: apps/server/src/domain/workflow/event-handlers.ts:1014-1018 — author's own comment names the missing event.
Existing dispatch path to reuse: event-handlers.ts:1069-1153.
Janitor rule pattern: apps/server/src/background/janitor.ts:528-564 (ruleReadyToMerge).
Three-way marker routing: same file, 1043-1067.

## User story As an operator, I want unmergeable open PRs whose author is a configured agent to be auto-rebased even when no triggering webhook fires, so that a long-lived PR doesn't sit stuck after `main` moves on under it. ## Background Forgejo fires no event when a PR's `mergeable` flips to `false`. We currently close that loop in two places: - `handlePostMergeRebase` (`apps/server/src/domain/workflow/event-handlers.ts:1069`) — runs on `pull_request closed && merged=true` and walks siblings on the same base. - `pr-changes-requested-graph.json` `mergeable_route` — routes a `not_mergeable` arm when a reviewer requests changes. Gaps both miss: - A push to `main` outside the PR-merge path (release tags, manual fast-forward, force push). - A PR that becomes unmergeable but no review activity follows. - The post-merge sibling sweep is best-effort: a transient API failure or a dedup-window collision skips the rebase silently. Operator observation 2026-05-03: rebase agents not triggered "at least not all the time" on conflicts. ## Proposed fix Add a janitor rule `unmergeable_pr_rebase` in `apps/server/src/background/janitor.ts`: 1. List open PRs per configured repo. 2. For each: fetch detail, check `mergeable === false`. 3. Resolve author via `resolveAgentByUser`; skip non-agent authors. 4. Honour `pr_dependencies` — same three-way routing as `handlePostMergeRebase` (skip if PR declares parents that haven't merged). 5. Reuse the existing post-merge dedup map + `markPostMergeRebaseDispatched` so a janitor pass and an event-driven pass can't double-dispatch. 6. Dispatch using the same `skillForEvent("rebase")` + `buildAgentRequest` + `dispatchByType` path as `handlePostMergeRebase`. ## Acceptance criteria ### Janitor rule - [ ] New rule `unmergeable_pr_rebase` registered in `_ALL_RULES` and `reconcileOnce` - [ ] Lists open PRs per repo via `impl.listOpenPullRequests` - [ ] Skips PRs whose `detail.mergeable !== false` - [ ] Skips PRs whose author isn't a configured agent - [ ] Honours `pr_dependencies` markers (skip if declared parents are still open) - [ ] Dispatches rebase via the shared `dispatchByType("rebase")` path ### Dedup - [ ] Re-uses the same `_postMergeRebaseDispatched` map keyed on `repo#pr@sha` - [ ] Janitor + event-driven path can't double-dispatch within the 10-minute window - [ ] `alreadyDispatchedPostMergeRebase` is exported and consumed by the rule ### Idempotency - [ ] Janitor's per-rule `canAct` window also gates the rule (defence in depth) - [ ] `markActed("unmergeable_pr_rebase", repo, "PR#N")` after dispatch ### Tests - [ ] Unit: rule dispatches when `mergeable=false` + agent author + no parents - [ ] Unit: rule skips when `mergeable=true` - [ ] Unit: rule skips when author isn't a configured agent - [ ] Unit: rule skips when PR declares an unmerged parent (B13 routing) - [ ] Unit: dedup map blocks double-dispatch when post-merge already fired - [ ] `just qa` clean ## Out of scope - Push-to-base webhook hook (could later replace the periodic sweep — separate ticket). - Watchdog re-run of the rebase task itself (already handled by `tail-pr-rebase-watchdog`). - Stacked-rebase cascade (already covered by `handleStackedRebaseCascade`). ## References - Hook gap: `apps/server/src/domain/workflow/event-handlers.ts:1014-1018` — author's own comment names the missing event. - Existing dispatch path to reuse: `event-handlers.ts:1069-1153`. - Janitor rule pattern: `apps/server/src/background/janitor.ts:528-564` (`ruleReadyToMerge`). - Three-way marker routing: same file, `1043-1067`.

claude-desktop added the

area:webhook

type:user-story

labels

2026-05-02 22:16:45 +00:00

charles referenced this issue from a commit

2026-05-02 22:23:26 +00:00

feat(janitor): unmergeable_pr_rebase rule (closes #781)

claude-desktop referenced this issue from a pull request that will close it,

2026-05-02 22:23:41 +00:00

feat(janitor): unmergeable_pr_rebase rule — auto-rebase when no event fires #783

charles referenced this issue from a commit

2026-05-02 22:36:11 +00:00

feat(janitor): unmergeable_pr_rebase rule — auto-rebase when no event fires (#783)

charles closed this issue

2026-05-02 22:36:11 +00:00

claude-desktop referenced this issue

2026-05-02 22:49:39 +00:00

Janitor rule: redispatch stale fix-ci on PRs whose CI is still red #784

charles referenced this issue from a commit

2026-05-02 22:55:46 +00:00

feat(janitor): stale_fix_ci_redispatch rule (closes #784)

No Branch/Tag specified

main

chore/sync-pre-push-from-forge-base

fix/flows-yaml-dispatch-identity

feat/board-tap-to-assign

dev/1107

code-lead/1106

code-lead/1108

dev/1104

code-lead/1103

code-lead/1080

dev/1087

feat/flows-yaml-ci-events

chore/board-drop-stalled-and-density-controls

fix/flows-yaml-routes-always-register

flows-yaml/api-defaults

dev/1023

fix/event-log-history-bleed

fix/janitor-fix-ci-logs-and-cap

dev/1022

fix/board-card-provider

code-lead/1036

dev/1025

code-lead/1020

dev/1017

code-lead/1026

feat/web-shortcut-registry-1018

dev/1015

code-lead/1009

code-lead/1008

dev/975

dev/969

dev/973

dev/967

code-lead/968

code-lead/953

dev/970

dev/976

code-lead/966

code-lead/956

code-lead/951

dev/962

dev/963

dev/977

dev/955

dev/983

dev/961

dev/974

code-lead/950

code-lead/939

dev/941

dev/940

dev/937

dev/938

dev/936

dev/935

feat/web-i18n-fr-locale

feat/spec-editor-ui-polish

chore/drop-legacy-compat

fix/skills-drop-preview-pane

fix/882-skills-safety-rail

dev/911

dev/909

dev/923

dev/917

dev/915

feat/879-sr11-m2-drop-legacy-skill

code-lead/873

dev/881

code-lead/869

dev/867

code-lead/845

code-lead/843

code-lead/844

dev/837

dev/861

dev/849

code-lead/837

code-lead/842

fix/dedup-rebase-inflight

dev/838

code-lead/847

dev/833

code-lead/848

pr/838

code-lead/841

feat/settings-save-bar/836

code-lead/840

dev/846

code-lead/839

dev/832

fix/board-sse-stale-cache

dev/834

dev/835

feat/settings-breadcrumbs

feat/forge-oauth-credentials

refactor/service-config-consolidation

feat/agent-tokens-to-secrets

feat/gitlab-oauth-to-db

feat/authelia-rip-and-voice-fixes

fix/rebase-storm-and-dead-letter

code-lead/797

code-lead/796

dev/811

code-lead/798

dev/810

code-lead/795

dev/808

code-lead/794

dev/805

dev/802

dev/803

feat/avatar-menu-settings-entry

feat/per-agent-token-tracking

dev/793

dev/747

dev/752

code-lead/790

code-lead/759

dev/756

dev/760

dev/741

dev/767

dev/740

dev/709

dev/644

dev/637

boss/614

dev/600

dev/611

dev/585

fix/login-bonus-fixes

boss/544

dev/542

refactor/api-prefix-and-session-gate

dev/489

boss/531

boss/518

dev/499

boss/516

dev/530

dev/517

dev/519

dev/515

dev/522

dev/503

dev/471

boss/329

dev/417

dev/418

dev/402

boss/327

dev/334

dev/332

boss/326

boss/325

dev/331

boss/324

boss/323

boss/322

dev/294

test/s11-task-analytics

dev/262

boss/270

dev/268

foreman/ui-consolidation-spec

dev/234

boss/196

boss/176

boss/164

fix/124-session-persist-bind

boss/52

dev/87

boss/73

dev/77

dev/81

dev/82

boss/79

dev/42

dev/35

boss/7

No results found.

Labels

Clear labels

area:agents

Agent types, pool scheduling, per-instance config

area:dashboard

Dashboard UI and observability surfaces

area:database

DB layer — schema, migrations, ORM, raw SQL

area:design

UI/UX mockup work — routes to designer agent

area:design-review

Design review dispatch — routes to design-reviewer agent

area:flows

Flow runner — YAML loader, executor, op registry, expression eval

area:infra

Deployment, isolation, containers, systemd units

area:meta

Tracking, scaffolding, project setup

area:security

Security — routes to reviewer-security (opus)

area:sessions

Session-id store, Claude SDK resume logic

area:webhook

Forgejo webhook routing and handlers

area:workdir

Clone cache, worktrees, git identity

security

Security-sensitive issue

Tracking or decisions, not implementation work

No labels

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

1 participant

Notifications

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

charles/claude-hooks#781

Reference in a new issue

Repository

charles/claude-hooks

Title

Body

No description provided.

Delete branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?

Rows
Columns