audit-reconcile-130-unmerged — Workgraph live mirror

Metadata

Status	done
Assigned	`agent-106`
Agent identity	`f51439356729d112a6c404803d88015d5b44832c6c584c62b96732b63c2b0c7e`
Created	2026-04-26T20:21:43.546899401+00:00
Started	2026-04-26T20:28:47.549902341+00:00
Completed	2026-04-26T20:51:07.596352875+00:00
Tags	`eval-scheduled`
Eval score	0.93
└ blocking impact	0.95
└ completeness	0.90
└ coordination overhead	0.95
└ correctness	0.95
└ downstream usability	0.95
└ efficiency	0.90
└ intent fidelity	0.94
└ style adherence	0.95

Description

git branch -r --no-merged main | wc -l returns 130. git log --oneline main | grep 'feat: .* (agent-' | wc -l returns 88. So roughly 60% of all agent work is sitting in unmerged worktree branches.

Mix of:

Truly stale exploration branches (research, plans abandoned)
Half-finished work that got superseded by another agent
'Done' work that for some reason didn't merge (the actual bug — should always merge on done)
Some that are valuable + should be merged

Spec

Audit — produce docs/audit-unmerged-branches-2026-04-26.md (mirror existing 2026-04-12 audit format) with each unmerged branch classified:
- status (last commit age, owning task status, whether superseded)
- recommendation: merge / archive / delete
- if 'merge': any conflicts vs current main + size of diff
Reconcile — execute the recommendations:
- 'merge': cherry-pick or merge cleanly; if conflicts, file follow-up tasks per branch
- 'archive': move to refs/archive/<branch-name>; out of active branch listing
- 'delete': drop entirely
Investigate why merges aren't happening — the agent done-flow should merge to main automatically (or open a PR). Determine which step is missing or broken. File follow-up if a code fix is needed.
Document the merge contract — when an agent claims done, its branch SHOULD land on main within X seconds (immediately, ideally). If not, either:
- The done flow has a bug (fix it)
- The branch failed eval (mark agent task as Failed, not Done)
- Manual review is required (file as PendingValidation, not Done)

Out of scope

Re-doing any unmerged work — just classify + reconcile what exists.
Long-tail design: how merging should work going forward is partially in spawn-single-source / smoke-gate-is.

Validation

Audit doc exists with all 130 branches classified.
Reconcile actions executed (merges done, archives moved, deletes done).
Post-reconcile: git branch -r --no-merged main returns < 30 (long-tail exploration only; no orphaned 'done' work).
Root-cause finding for 'why merges aren't happening' captured in the audit doc; follow-up task filed if needed.
cargo build + cargo test pass (no breakage from merges)

## Description

`git branch -r --no-merged main | wc -l` returns 130. `git log --oneline main | grep 'feat: .* (agent-' | wc -l` returns 88. So roughly 60% of all agent work is sitting in unmerged worktree branches.

Mix of:
- Truly stale exploration branches (research, plans abandoned)
- Half-finished work that got superseded by another agent
- 'Done' work that for some reason didn't merge (the actual bug — should always merge on done)
- Some that are valuable + should be merged

### Spec

1. **Audit** — produce `docs/audit-unmerged-branches-2026-04-26.md` (mirror existing 2026-04-12 audit format) with each unmerged branch classified:
   - status (last commit age, owning task status, whether superseded)
   - recommendation: merge / archive / delete
   - if 'merge': any conflicts vs current main + size of diff

2. **Reconcile** — execute the recommendations:
   - 'merge': cherry-pick or merge cleanly; if conflicts, file follow-up tasks per branch
   - 'archive': move to `refs/archive/<branch-name>`; out of active branch listing
   - 'delete': drop entirely

3. **Investigate why merges aren't happening** — the agent done-flow should merge to main automatically (or open a PR). Determine which step is missing or broken. File follow-up if a code fix is needed.

4. **Document the merge contract** — when an agent claims done, its branch SHOULD land on main within X seconds (immediately, ideally). If not, either:
   - The done flow has a bug (fix it)
   - The branch failed eval (mark agent task as Failed, not Done)
   - Manual review is required (file as PendingValidation, not Done)

### Out of scope

- Re-doing any unmerged work — just classify + reconcile what exists.
- Long-tail design: how merging should work going forward is partially in spawn-single-source / smoke-gate-is.

## Validation

- [ ] Audit doc exists with all 130 branches classified.
- [ ] Reconcile actions executed (merges done, archives moved, deletes done).
- [ ] Post-reconcile: `git branch -r --no-merged main` returns < 30 (long-tail exploration only; no orphaned 'done' work).
- [ ] Root-cause finding for 'why merges aren't happening' captured in the audit doc; follow-up task filed if needed.
- [ ] cargo build + cargo test pass (no breakage from merges)

Depends on

done .assign-audit-reconcile-130-unmerged

Required by

(none)

Log

2026-04-26T20:21:43.540964709+00:00 Task paused
2026-04-26T20:21:51.955548784+00:00 Task published
2026-04-26T20:27:47.655834603+00:00 Lightweight assignment: agent=Careful Programmer (f5143935), exec_mode=full, context_scope=task, reason=Careful Programmer with 41 completed tasks is best fit for careful branch reconciliation, root-cause analysis, and documentation that requires precision and understanding of merge implications.
2026-04-26T20:28:47.549906458+00:00 Spawned by coordinator --executor claude --model opus
2026-04-26T20:28:57.689468109+00:00 Starting audit of 130 unmerged branches
2026-04-26T20:41:00.031629011+00:00 Audit doc written: docs/audit-unmerged-branches-2026-04-26.md (96 cat-a, 23 cat-b, 0 cat-c, 13 non-agent out-of-scope)
2026-04-26T20:41:00.313544084+00:00 Root cause: wg done's stigmergic merge-back does NOT push origin/main and does NOT delete origin agent branch. Local main is 40 commits ahead of origin/main.
2026-04-26T20:41:19.423047848+00:00 Pushed origin main: 362515a7d..f0b739f04 (40-commit FF). Squash commits now durable on origin.
2026-04-26T20:44:07.944427431+00:00 Archived 122 agent branches to refs/archive/wg/agent-* on origin; deleted 122 origin/wg/agent-* refs. Remaining unmerged: 13 non-agent.
2026-04-26T20:48:48.575473183+00:00 cargo build: PASS. cargo test --lib: 1947 passed. cargo test integration: 1 PRE-EXISTING failure (assigner_to_creator_signal_path_exists — assertion mismatch between Creator default_tier impl (Premium) and test expectation (Standard) introduced by agent-4/cheap-by-default; not caused by this audit's reconcile actions). Will file follow-up.
2026-04-26T20:49:50.460961472+00:00 Filed 3 follow-up tasks: fix-wg-done (load-bearing — closes the merge gap), cherry-pick-valuable (selective merge from refs/archive/*), fix-pre-existing (unrelated test failure surfaced during validation).
2026-04-26T20:50:46.614060287+00:00 Committed: a448d6b0a — pushed to remote
2026-04-26T20:51:07.596366500+00:00 Task marked as done