v0.1.31

Catch-up follows the PR target

wtc catch-up now reads the merge target of each open or draft pull request on GitHub and Bitbucket. It merges the fetched target into the PR branch and pushes the result. Live branches without a PR continue to use the repository's configured development ref. If a PR target is missing, invalid, or inconsistent across PRs on one branch, catch-up leaves the branch untouched and reports an owner handoff.

The catch-up report now includes the target ref, conflicted paths when a merge fails, and a concrete next action for the owning agent. The bundled catch-up skill starts with the tool run and uses its report to guide conflict resolution.

Conflict signals in status

Status snapshots now record unfinished local Git operations and unresolved conflicts. The TUI shows a red conflict symbol for unresolved local merges and for GitHub PRs whose merge state reports a conflict. Incoming commit counts turn red for conflicted PRs; the PR table also labels the conflict. Status colors use the terminal's configurable palette and continue to honor NO_COLOR.

Verification

The exact merge commit passed the CLI's main branch test and build workflow. Synthetic tests cover missing PR targets, unfinished merges, catch-up reports, and TUI conflict rendering.