Spike-lock push targets origin's default branch; staleness 60min → 6h (#1364 review) - #1394
Merged
Conversation
… -> 6h (#1364 review) The lock commit pushed HEAD:<current branch>, publishing whatever branch the daemon's checkout was on and leaving main-forked machines blind to the locks. It now pushes to origin's default branch, and only when the checkout is on it — HEAD:main from a feature branch would carry foreign commits onto main. Skips are logged. SPIKE_LOCK_STALE_MS becomes 6 hours: spiking and planning can take hours, and staleness release is recovery, ideally never needed. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
suleimansh
marked this pull request as ready for review
July 30, 2026 21:05
suleimansh
added a commit
that referenced
this pull request
Jul 30, 2026
Both PRs edited maybeAutoHandoff's neighborhood: the merge keeps the #1363 merge gate and adds this branch's `fixes` ride-along beside it. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
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.
TLDR: the two code smells from the #1364 post-merge review.
HEAD:<current branch>. That published whatever branch the daemon's checkout happened to be on, and locks never reached the branch other machines fork from. Now it pushes to origin's default branch — and only when the checkout is on it, becauseHEAD:mainfrom a feature branch would carry that branch's own commits onto main. A skipped push is logged; the commit still guards local forks either way.SPIKE_LOCK_STALE_MS— 60 min → 6 h. Spiking and planning can take hours, and staleness release is a bug-recovery mechanism that ideally never fires, so erring long is nearly free.spec.md updated, feature-branch case tested, changeset included. Suite: 1632/0.
The third point of the review (LoC added vs deleted, "how much AI slop") is answered on #1364 directly.
🤖 Generated with Claude Code