Skip to content

Ux audit#7

Merged
DanHenton merged 2 commits into
mainfrom
ux-audit
Apr 13, 2026
Merged

Ux audit#7
DanHenton merged 2 commits into
mainfrom
ux-audit

Conversation

@DanHenton
Copy link
Copy Markdown
Owner

No description provided.

Dan Henton added 2 commits April 13, 2026 22:00
- Fix AlreadyExists to propagate git errors instead of silently returning false
- Replace exec.Command(cp) with native Go file/dir copy (no shell dependency)
- Validate agent/ branch prefix before merge to reject unmanaged worktrees
- Add exec.LookPath check before launching opencode binary
- Move merge lock from /tmp to repo-local .git/agent-merge.lock
- Rewrite CLI with flag.FlagSet per subcommand with per-command help and examples
- Add cleanup --dry-run and --yes flags with interactive prompt (isatty guard)
- Auto-detect terminal for emoji, route warnings to stderr
- Show step-by-step recovery guidance on merge conflicts
- Extract handleMergeError helper to deduplicate conflict handling
@DanHenton DanHenton marked this pull request as ready for review April 13, 2026 11:10
@DanHenton DanHenton merged commit cdb9604 into main Apr 13, 2026
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant