Add out-of-band branch timeline manager#395
Draft
adamziel wants to merge 7 commits into
Draft
Conversation
Contributor
Author
|
Follow-up fix for the empty chart preview:
Verified again with |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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.
What it does
Adds an out-of-band ForkPress branch manager at
/_forkpress/branches. It renders branch history as a git-style timeline with separate lanes, visible fork points from setup metadata, merge arcs back into target branches, and conflict markers that open the conflict review flow.It also keeps the existing WordPress admin page as a pointer into the out-of-band manager instead of trying to host the full workflow inside
wp-admin.Rationale
The in-admin branch widget is too small for history review, conflict inspection, and branch switching. The earlier flat graph also hid the important relationship: setup runs are
branch -> branch, but users expect to see them as branch-off points in a timeline.Implementation
runtime/cow/router.phpnow serves the manager directly before WordPress boots. The graph loadsforkpress branch tree --format json, infers branch fork parents from setup and merge runs, draws finite lanes, and annotates conflicted runs by loading conflict audit summaries.Conflict review now displays decoded base/source/target/current values, editable review notes, and selected resolution actions instead of forcing users to read raw JSON. The WordPress plugin and router both accept those notes and pass them through to
merge-review/merge-resolve.Testing instructions
Focused checks run locally:
Live preview used for visual verification:
https://forkpress.ai-sandbox-49184.kostka.zielinscy.dev/_forkpress/branches?graph=timeline-git-v2