chore(main): release 1.40.0 - #187
Merged
Merged
Conversation
TylerStaplerAtFanatics
changed the title
TylerStaplerAtFanatics
force-pushed
the
release-please--branches--main
branch
2 times, most recently
from
July 25, 2026 23:42
e662df2 to
0be723d
Compare
tstapler
added a commit
that referenced
this pull request
Jul 26, 2026
) push_failed had zero automated remediation — MarkStuck fired once on a non-fast-forward push rejection and nothing ever retried, so an item with no active session stayed stuck forever. Live-repro'd 2026-07-20: backlog item c2ad7bf3-91bf-4d47-8654-0f2f20869080 (stelekit PR smtg-ai#251) sat stuck since 2026-07-19T17:06 with no path to self-resolve. Adds reconcilePushFailedItems, a new periodic detector wired into ReconcileStuck, gated through the existing Storage.RemediationDue backoff schedule (Phase A) the same way autoReopenWithBackoffGate/bouncing does. On each due attempt, attemptPushRemediation fetches+merges the branch's current remote ref into the worktree (via a new injectable branchReconciler, defaulting to git.MergeMainIntoWorktree) and, on a clean merge, retries the full push+PR flow via the existing pushAndCreatePR. A real content conflict is left alone — not auto-resolved — with a distinct "Manual rebase needed" notification naming the conflicting files. Verified live against the repro item after redeploy: the sweep detected the item, ran a real git fetch+merge against the actual GitHub remote, correctly identified the genuine conflict in .backlog-context.md (independently confirmed via a manual dry-run merge), declined to force-resolve it, and correctly respected the backoff schedule on subsequent ticks rather than hammering retries. Claude-Session: https://claude.ai/code/session_01BxNAMeGteuzNyN46Q4zAn1 Co-authored-by: Claude Sonnet 5 <noreply@anthropic.com>
github-actions
Bot
changed the title
github-actions
Bot
force-pushed
the
release-please--branches--main
branch
from
July 26, 2026 18:20
0be723d to
633dbf3
Compare
github-actions
Bot
force-pushed
the
release-please--branches--main
branch
from
July 27, 2026 15:16
633dbf3 to
c95130a
Compare
|
🤖 Created releases: 🌻 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
🤖 I have created a release beep boop
1.40.0 (2026-07-27)
Features
Bug Fixes
This PR was generated with Release Please. See documentation.