Skip to content

fix: resolve rebase conflicts from AI generation merge - #21

Merged
0xLeif merged 2 commits into
mainfrom
fix/resolve-rebase-conflicts
Mar 19, 2026
Merged

fix: resolve rebase conflicts from AI generation merge#21
0xLeif merged 2 commits into
mainfrom
fix/resolve-rebase-conflicts

Conversation

@0xLeif

@0xLeif 0xLeif commented Mar 19, 2026

Copy link
Copy Markdown
Contributor

Summary

Test plan

  • cargo check passes
  • No conflict markers remain
  • No functional changes — diff is purely formatting

🤖 Generated with Claude Code

0xLeif and others added 2 commits March 19, 2026 08:26
- Add ai module for generating specs via external AI commands (e.g. claude, ollama)
- Support flat-file module discovery alongside subdirectory-based modules
- Track lines-of-code coverage in addition to file coverage
- Add --ai flag to generate command with fallback to template on failure
- Add ai_command and ai_timeout config fields to SpecSyncConfig
- Improve generate command to work when no specs exist yet
- Filter empty spec directories from module detection

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
@0xLeif
0xLeif merged commit 30312f3 into main Mar 19, 2026
7 checks passed
@0xLeif
0xLeif deleted the fix/resolve-rebase-conflicts branch March 19, 2026 14:35
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