df04acd4e2
Three merger fallback commit paths (auto-resolve-all-conflicts, -X theirs/ours side strategy, AI-agent-didn't-commit) hard-coded `feat(FN-XXXX): merge fusion/fn-xxxx` as the subject and never used the AI subject summarizer. Route them through buildDeterministicMergeMessage so they pick up aiSubject when available. When the AI subject summarizer returns null, derive the subject from the branch's first step commit (with conventional-commit prefix stripped, plus `(+N more)` for multi-commit branches) instead of the bare `merge <branch>` template. Bump DEFAULT_COMMIT_SUBJECT_TIMEOUT_MS 15s → 30s so slow-first-token providers complete instead of silently falling back. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
742 B
742 B
@runfusion/fusion
| @runfusion/fusion |
|---|
| patch |
Fix merge commits landing with the bare feat(FN-XXXX): merge fusion/fn-xxxx subject. Three fallback commit paths in the merger (auto-resolve-all-conflicts, -X theirs/ours side strategy, AI-agent-didn't-commit) now route through the same deterministic message builder as the happy path, so they pick up the AI-generated subject when available. When the AI subject summarizer returns null, the subject is now derived from the branch's first step-commit (with conventional-commit prefix stripped, plus (+N more) when multiple commits) instead of falling back to merge <branch>. Subject-summarizer timeout raised from 15s to 30s so slow-first-token providers complete instead of silently falling back.