Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 58 additions & 0 deletions docs/PR_TRIAGE_2026-03-07.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
# PR Triage Report - 2026-03-07

## Summary

6 open PRs from fork `whitmo/multiclaude` targeting `dlorenc/multiclaude:main`.
All PRs build, pass tests, and align with ROADMAP.md priorities.
All are individually mergeable with current main (`dfad1a5`).

## Recommended Merge Order

Merge in this order to avoid conflicts:

### Wave 1: No conflicts (can merge in any order)

| # | PR | Priority | Title |
|---|-----|----------|-------|
| 1 | [#359](https://github.com/dlorenc/multiclaude/pull/359) | P0 | fix: replace `--append-system-prompt-file` with `--append-system-prompt` |
| 2 | [#361](https://github.com/dlorenc/multiclaude/pull/361) | P0 | fix: improve worktree sync reliability for refresh operations |
| 3 | [#363](https://github.com/dlorenc/multiclaude/pull/363) | P1 | feat: Track PR outcomes end-to-end in task history |

These three PRs have zero conflicts with each other or any other open PR.

### Wave 2: Merge before #364

| # | PR | Priority | Title |
|---|-----|----------|-------|
| 4 | [#360](https://github.com/dlorenc/multiclaude/pull/360) | P0 | fix: improve worker lifecycle reliability |
| 5 | [#362](https://github.com/dlorenc/multiclaude/pull/362) | P1 | fix: recover crashed agents by recreating missing tmux windows |

These conflict with #364 but not with each other or Wave 1 PRs.

### Wave 3: Merge last (needs rebase)

| # | PR | Priority | Title |
|---|-----|----------|-------|
| 6 | [#364](https://github.com/dlorenc/multiclaude/pull/364) | P0 | fix: Clear error messages with structured errors and suggestions |

Conflicts with #360 (`internal/cli/cli.go`) and #362 (`internal/daemon/daemon.go`).
Must be rebased after both merge.

## Roadmap Coverage

| Roadmap Item | Priority | PR(s) |
|-------------|----------|-------|
| Reliable worker lifecycle | P0 | #360 |
| Worktree sync | P0 | #361 |
| Clear error messages | P0 | #364 |
| Task history | P1 | #363 |
| Agent restart | P1 | #362 |
| Bug fix (prompt flag) | P0 | #359 |

## Verification

All PRs verified on 2026-03-07:
- `go build ./cmd/multiclaude` - pass
- `go test ./...` (relevant packages) - pass
- `git merge-tree` against `upstream/main` - clean
- Inter-PR conflict matrix tested via sequential merge