yusyus e7ec923d47 feat: Phase 3-5 - Conflict detection + intelligent merging ...

Phase 3: Conflict Detection System ✅
- Created conflict_detector.py (500+ lines)
- Detects 4 conflict types:
  * missing_in_docs - API in code but not documented
  * missing_in_code - Documented API doesn't exist
  * signature_mismatch - Different parameters/types
  * description_mismatch - Docs vs code comments differ
- Fuzzy matching for similar names
- Severity classification (low/medium/high)
- Generates detailed conflict reports

Phase 4: Rule-Based Merger ✅
- Fast, deterministic merging rules
- 4 rules for handling conflicts:
  1. Docs only → Include with [DOCS_ONLY] tag
  2. Code only → Include with [UNDOCUMENTED] tag
  3. Perfect match → Include normally
  4. Conflict → Prefer code signature, keep docs description
- Generates unified API reference
- Summary statistics (matched, conflicts, etc.)

Phase 5: Claude-Enhanced Merger ✅
- AI-powered conflict reconciliation
- Opens Claude Code in new terminal
- Provides merge context and instructions
- Creates workspace with conflicts.json
- Waits for human-supervised merge
- Falls back to rule-based if needed

Testing:
✅ Conflict detector finds 5 conflicts in test data
✅ Rule-based merger successfully merges 5 APIs
✅ Proper handling of docs_only vs code_only
✅ JSON serialization works correctly

Next: Orchestrator to tie everything together

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

2025-10-26 15:17:27 +03:00

17 KiB

Raw Blame History

View Raw