Forgejo: re-check agent PRs for conflicts when their base branch is pushed #90

Merged

lucas merged 1 commit from agent/issue-89-base-push-conflicts into main

2026-10-26 16:19:02 +01:00

omp-deck commented

2026-10-26 16:09:00 +01:00

Collaborator

Implements the plan in #89.

webhook.ts: push deliveries to refs/heads/* are accepted as a repo-level pushed row (number 0), including the agent's own pushes; tag pushes and branch deletions are ignored.
dispatch-api.ts: PullSummary gains mergeable / baseBranch; new listOpenPulls (state=open, also filtered client-side).
dispatcher.ts: handleBasePush fans a pushed row out into one base_pushed row per open agent PR targeting the branch (failures go to the deck fallback only, since there is no thread). The gate treats base_pushed like a push to the agent's PR: no permission check, drops on base change or when Forgejo does not report mergeable: false. baseConflictSeed confirms with checkBaseConflict (injectable) in the session's checkout; a missing session is created as an implementer session.
conversation-detect.ts: buildBaseConflictSeed with conflicting files, optional catch-up text and the shared rebaseInstruction.
Docs: enable the Push webhook event.

Tests: webhook classification cases and dispatcher fan-out / mergeable drop / clean local merge / mapped & new session / failed check. bun test apps/server/src/forgejo passes (277), server and web typecheck clean. Not exercised against a live Forgejo instance; whether mergeable can briefly read false right after a push is unverified (the local check filters that).

Closes: #89

Implements the plan in #89. - `webhook.ts`: `push` deliveries to `refs/heads/*` are accepted as a repo-level `pushed` row (number 0), including the agent's own pushes; tag pushes and branch deletions are ignored. - `dispatch-api.ts`: `PullSummary` gains `mergeable` / `baseBranch`; new `listOpenPulls` (`state=open`, also filtered client-side). - `dispatcher.ts`: `handleBasePush` fans a `pushed` row out into one `base_pushed` row per open agent PR targeting the branch (failures go to the deck fallback only, since there is no thread). The gate treats `base_pushed` like a push to the agent's PR: no permission check, drops on base change or when Forgejo does not report `mergeable: false`. `baseConflictSeed` confirms with `checkBaseConflict` (injectable) in the session's checkout; a missing session is created as an implementer session. - `conversation-detect.ts`: `buildBaseConflictSeed` with conflicting files, optional catch-up text and the shared `rebaseInstruction`. - Docs: enable the **Push** webhook event. Tests: webhook classification cases and dispatcher fan-out / mergeable drop / clean local merge / mapped & new session / failed check. `bun test apps/server/src/forgejo` passes (277), server and web typecheck clean. Not exercised against a live Forgejo instance; whether `mergeable` can briefly read `false` right after a push is unverified (the local check filters that). Closes: #89

omp-deck added 1 commit

2026-10-26 16:09:01 +01:00

feat(forgejo): re-check agent PRs for conflicts on base pushes 88f288e4bc

A Forgejo `push` to a branch is queued as a repo-level `pushed` row and
fanned out into one `base_pushed` check per open agent PR targeting it.
A check whose PR Forgejo reports unmergeable is confirmed with a local
merge-tree in the PR's session checkout; a real conflict runs a turn
asking the agent to rebase, creating an implementer session if needed.

Closes: #89
Co-Authored-By: Claude Opus 5.5 via omp-deck