cherry-pick-valuable

Metadata

Description

git fetch origin refs/archive/wg/agent-N/<task>:refs/archive/wg/agent-N/<task>
git cherry-pick <archive-tip>
# or for a clean squash:
git merge --squash refs/archive/wg/agent-N/<task>

## Description

Selectively cherry-pick the 8 "valuable, isolated" branches identified in `docs/audit-unmerged-branches-2026-04-26.md` from `refs/archive/wg/agent-*` into main. Each pick is independent — file conflicts only happen if a later refactor on main collides.

## Branches to evaluate

(All preserved at `refs/archive/wg/agent-N/<task>` on origin.)

| Archive ref | Diff vs current main | Why valuable |
|-------------|----------------------|--------------|
| `refs/archive/wg/agent-69/thin-wrapper-impl` | +429/-1 (5 files) | Task is `pending-validation`; either ship it or fail it |
| `refs/archive/wg/agent-141/nex-ux-600s` | +60/-4 (5 files) | Nex UX for slow local models |
| `refs/archive/wg/agent-16762/tui-firehose-readable` | +293/-46 (3 files) | Firehose word-wrap + jump-to-task |
| `refs/archive/wg/agent-232/fix-tui-native` | +18/-36 (3 files) | Propagate executor type to PTY child env |
| `refs/archive/wg/agent-322/fix-or-remove` | +7/-2 (1 file) | `keep_recent_tool_results` test param fix |
| `refs/archive/wg/agent-330/coordinator-should-auto` | +157 (1 file) | Auto-dispatch shell-mode tasks in coordinator |
| `refs/archive/wg/agent-332/hide-dot-prefixed` | +191/-41 (4 files) | Hide `.` tasks from default `wg list` / `wg status` |
| `refs/archive/wg/agent-364/skip-flip-evaluation` | +155/-5 (1 file) | Skip-eval tag support |
| `refs/archive/wg/agent-337/agency-pipeline-should` | +762 (10 files) | Constraint-fidelity lint for agency eval — needs design review, NOT a blind cherry-pick |

## File scope per pick

Each cherry-pick gets its own commit. If any pick conflicts or breaks tests, **fail that pick only** and continue with the rest. Do not bundle.

## Validation

- [ ] For each pick, run `cargo build && cargo test` after cherry-pick.
- [ ] Log per-pick outcome (merged / conflict-skipped / test-skipped) in commit body.
- [ ] Reference `docs/audit-unmerged-branches-2026-04-26.md` and the archive ref in each commit.

## Recovery (per pick)

```
git fetch origin refs/archive/wg/agent-N/<task>:refs/archive/wg/agent-N/<task>
git cherry-pick <archive-tip>
# or for a clean squash:
git merge --squash refs/archive/wg/agent-N/<task>
```

Pulled archive refs are local-only by default — `git fetch origin "refs/archive/*:refs/archive/*"` mirrors them all.

Depends on

• done .assign-cherry-pick-valuable

Required by

• done design-review-agency

Log

• 2026-04-26T20:52:47.602889793+00:00 Lightweight assignment: agent=Careful Programmer (f5143935), exec_mode=full, context_scope=task, reason=Careful Programmer best matches cherry-pick requirements: code integration, conflict handling, thorough validation, and careful judgment on whether to skip problematic picks.
• 2026-04-26T21:03:24.916847418+00:00 Spawned by coordinator --executor claude --model opus
• 2026-04-26T21:03:37.167164477+00:00 Starting cherry-pick task. Reading audit doc to understand each branch.
• 2026-04-26T21:10:43.248728329+00:00 Task marked as failed: Agent exited with code 1
• 2026-04-26T22:44:09.543477055+00:00 Task reset for retry from failed (attempt #2)
• 2026-04-26T22:44:13.353653175+00:00 Spawned by coordinator --executor claude --model opus
• 2026-04-26T22:44:28.391220844+00:00 Resuming after agent-114 failed. Strategy: cherry-pick each branch sequentially, validate with cargo build + tests, fail-pick-only on errors. Will start by fetching archive refs.
• 2026-04-26T22:50:39.669852493+00:00 Pick 1/9: agent-322/fix-or-remove (0e23488c2) — cherry-picked clean, integration_context_pressure tests pass.
• 2026-04-26T22:51:44.763021791+00:00 Pick 2/9: agent-330/coordinator-should-auto (aad705ab0) — cherry-picked clean, build passes.
• 2026-04-26T22:52:53.644037087+00:00 Pick 3/9: agent-364/skip-flip-evaluation (d4f426a24) — cherry-picked clean, build passes.
• 2026-04-26T22:54:05.417884491+00:00 Pick 4/9: agent-141/nex-ux-600s (8276ad0f1) — minor comment conflict, resolved by merging both descriptions; build passes.
• 2026-04-26T22:55:08.194696561+00:00 Pick 5/9: agent-69/thin-wrapper-impl (5236701cf) — minor mod.rs conflict (compact module deleted on main); resolved by keeping codex_oai_compat only. Build passes.
• 2026-04-26T22:55:41.618847974+00:00 Pick 6/9 SKIPPED: agent-16762/tui-firehose-readable (c603ae22d) — Firehose tab was retired on main (state.rs comments mark FirehoseLine as dead code: 'Phase 4 dead code — Firehose tab is gone.'). Cherry-picking would resurrect a removed feature. Aborted.
• 2026-04-26T23:00:58.166973374+00:00 Pick 7/9: agent-332/hide-dot-prefixed (f93caa75c) — conflicts in status.rs (compaction widget removed on main); resolved by dropping compaction-related test, keeping show_all parameter additions. Build + status tests pass.
• 2026-04-26T23:01:59.037075822+00:00 Pick 8/9: agent-232/fix-tui-native (530ac2383) — only the tip commit applied (other 3 routed coordinator through wg spawn-task, but main has since chosen the wg nex --resume path; conflicts indicated divergent design). Tip commit (PTY child env override) cleanly applied.
• 2026-04-26T23:13:14.871265797+00:00 Pick 9/9 DEFERRED: agent-337/agency-pipeline-should — task description explicitly flags as needing design review. Created follow-up task design-review-agency.
• 2026-04-26T23:22:45.538329568+00:00 All picks committed and pushed. Summary: 6 picked (322, 330, 364, 141, 69, 332, 232-tip), 1 skipped (16762 — firehose retired on main), 1 deferred (337 — needs design review, follow-up created). Pre-existing test failures (36 in commands::done, provenance) confirmed unrelated to picks (failing on pristine origin/main). Branch pushed: wg/agent-156/cherry-pick-valuable.
• 2026-04-26T23:28:44.069713599+00:00 Task marked as done