Implement pre-merge validation command

[eberrigan]

Overview

Implement the /pre-merge-check command as defined in the OpenSpec proposal to provide comprehensive validation before merging PRs.

Background

OpenSpec proposal: openspec/changes/add-pre-merge-validation/proposal.md

This command will orchestrate all validation steps (Terraform, YAML, Bash), detect merge conflicts, analyze PR status, and identify unaddressed review comments.

Implementation Tasks

Phase 1: ✅ Repository Preparation (COMPLETED)

• Remove .claude/ from .gitignore (commit ca6f2fa)
• Commit .claude/ directory to repository (commit ca6f2fa)

Phase 2: Core Command Implementation (TODO)

• Create .claude/commands/pre-merge-check.md
• Implement three execution modes (local, pre-pr, pre-merge)
• Implement git status validation (conflicts, divergence)
• Orchestrate existing validation commands
• Integrate PR analysis via gh CLI
• Implement OpenSpec validation integration
• Add clear reporting and verdict logic

Phase 3: Address Current PR #17 Issues (TODO)

• Resolve merge conflicts with main
• Fix CRITICAL syntax error in main.tf:299 (missing closing brace)
• Fix SECURITY issue in user_data.sh:49 (quote variable)
• Fix BUG in main.tf:256 (empty DOMAIN_NAME for CloudFlare)
• Address remaining 7 Copilot comments
• Run new /pre-merge-check command to verify

Phase 4: Documentation and Testing (TODO)

• Write command usage documentation
• Add examples for each mode
• Test with various scenarios
• Update README.md

Success Criteria

• Command completes in <10 minutes (pre-merge mode)
• Detects 100% of merge conflicts
• Reports all validation failures
• Analyzes PR review comments correctly
• Provides clear "Ready/Not Ready" verdict
• All 10 Copilot comments in PR Implement simplified DNS/SSL configuration and add config validation to CI #17 addressed
• PR Implement simplified DNS/SSL configuration and add config validation to CI #17 ready to merge

References

• OpenSpec proposal: openspec/changes/add-pre-merge-validation/proposal.md
• Spec: openspec/changes/add-pre-merge-validation/specs/development-commands/spec.md
• Tasks: openspec/changes/add-pre-merge-validation/tasks.md
• Related: Issue Automate example configuration testing in CI #22 (automate config testing in CI)

Next Steps

1. Implement /pre-merge-check command following tasks.md
2. Test with current PR Implement simplified DNS/SSL configuration and add config validation to CI #17
3. Address all Copilot comments identified by command
4. Merge PR Implement simplified DNS/SSL configuration and add config validation to CI #17 once command shows "Ready to Merge"

[eberrigan]

✅ Significant Progress in PR #17

The core of this issue has been completed:

What Was Implemented

1. Repository Preparation ✅

• .claude/ directory now tracked in git
• .claude/settings.local.json gitignored for personal settings
• Commands are versioned and reviewed like code

2. Pre-Merge Check Command ✅

• Created .claude/commands/pre-merge-check.md
• Three execution modes: local (fast), pre-pr (comprehensive), pre-merge (full)
• Orchestrates validation commands: terraform, YAML, bash
• PR analysis via gh CLI
• Clear "Ready/Not Ready" verdict

3. All PR #17 Issues Resolved ✅

• All 11 Copilot comments addressed
• Merge conflicts resolved
• SECURITY issues fixed (quoted variables)
• Configuration bugs fixed (CloudFlare DOMAIN_NAME)
• PR Implement simplified DNS/SSL configuration and add config validation to CI #17 successfully merged

Command Usage

The /pre-merge-check command is now available and documented. Use it before merging PRs:

# Quick local check before pushing
/pre-merge-check local

# Comprehensive check before creating PR
/pre-merge-check pre-pr

# Full check before merging (includes PR analysis)
/pre-merge-check pre-merge

Remaining Work

The command specification is complete. Future enhancements could include:

• Additional automation of validation steps
• Performance optimizations
• Enhanced reporting formats

Status: Command is ready to use. Issue can be closed or kept open for future enhancements.

References

• PR Implement simplified DNS/SSL configuration and add config validation to CI #17: Implement simplified DNS/SSL configuration and add config validation to CI #17
• Command: .claude/commands/pre-merge-check.md