Skip to content

Comments

🧙 Improve add wizard with merge prompt and dirty check#17517

Merged
dsyme merged 1 commit intomainfrom
awiz
Feb 21, 2026
Merged

🧙 Improve add wizard with merge prompt and dirty check#17517
dsyme merged 1 commit intomainfrom
awiz

Conversation

@dsyme
Copy link
Contributor

@dsyme dsyme commented Feb 21, 2026

Summary

  • Adds an interactive confirmation prompt when a PR merge fails, allowing users to continue manually or stop gracefully
  • Validates that the working directory is clean early in the wizard flow, before PR creation, with helpful recovery instructions
  • Surfaces clear error messages and guidance for both failure scenarios

Copilot AI review requested due to automatic review settings February 21, 2026 15:09
Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR enhances the interactive add wizard with better user experience improvements for two failure scenarios: PR merge failures and dirty working directories.

Changes:

  • Adds early validation for clean working directory before PR creation to fail fast with clear guidance
  • Implements an interactive confirmation prompt when PR merge fails, allowing users to manually merge and continue or stop gracefully
  • Provides helpful error messages with recovery instructions for both scenarios

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.

File Description
pkg/cli/add_interactive_orchestrator.go Adds early clean working directory check at Step 3b, before workflow file operations
pkg/cli/add_interactive_git.go Implements merge failure prompt with continue/stop options and checkCleanWorkingDirectory method with user-friendly error guidance

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

@dsyme dsyme merged commit b41c87b into main Feb 21, 2026
93 checks passed
@dsyme dsyme deleted the awiz branch February 21, 2026 15:53
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