Pipeline Plan 37

Implementation plan is complete. Here's a summary of what was found and planned:

Plan Summary

Upstream is at v3.2.4 (42 commits ahead of merge base), not v3.2.0 as originally stated. The fork has 38 local commits to preserve.

Conflict Analysis (dry-run merge)

11 files conflict out of 33 modified on both sides. The other 22 auto-merge cleanly.

Resolution	Files	Strategy
Keep local	3	.claude/CLAUDE.md (thin wrapper), 2 ephemeral caches (delete)
Merge both	8	Scripts get local fixes + upstream shellcheck/features; templates get no hardcoded test_cmd + audit stage + full model names

Key decisions

• .claude/CLAUDE.md: Keep fork's thin wrapper (upstream only updated auto-generated line counts)
• Pipeline templates (autonomous, cost-aware, full): Accept upstream's new audit stage and full model names, but remove "test_cmd": "npm test" per local fix #25
• Scripts (detection, hygiene, otel, pipeline, tmux-status): Keep local functional improvements (multi-lang detection, perf optimization, Bash 3.2 compat, goal compaction), add upstream's shellcheck directives and new env vars

15-task checklist covers

1. Execute the merge
2. Resolve all 11 conflicts
3. Verify version consistency at 3.2.4
4. Run full test suite
5. Fix any failures
6. Open PR

The full plan is at .claude/IMPLEMENTATION_PLAN.md and the pipeline state has been advanced to the design stage.