Merged
Conversation
Entire-Checkpoint: 013118c3a750
peyton-alt
added a commit
that referenced
this pull request
Apr 21, 2026
…rivation Covers issues #1-7 from the multi-agent PR review pass: 1-2. Settings-load errors no longer wipe user config. Both runReview and saveReviewConfig now distinguish "file missing" (settings.Load returns defaults) from "file malformed" (returns err). Malformed-file errors surface to the user with a friendly "fix .entire/settings.json" hint instead of silently opening the picker and overwriting unrelated settings with an empty EntireSettings{}. 3. Pending marker is now cleaned up on every spawn-path failure via a deferred best-effort ClearPendingReviewMarker. Previously it only fired on execCmd.Run() non-zero exit, so a clean agent exit without any UserPromptSubmit (e.g. /quit) would leave the marker behind to mis-tag the next unrelated session. 4. detectBaseBranch loop order now matches its docstring: all remote- tracking branches (origin/main, origin/master) are tried before any local branch. The doc-vs-code drift the comment-analyzer caught is fixed; a regression test pins the order. 5. HasReview derivation no longer lives as a hardcoded string literal in the checkpoint package. session.Kind.IsReview() is the single source of truth; manual_commit_condensation sets WriteCommittedOptions .HasReview via that helper. Future review-kind Kind values just add to the IsReview disjunction and HasReview keeps covering them — previously a typo of "agent_review" in committed.go would have silently broken the feature. 6. Context now threads through pendingMarkerPath, WritePendingReviewMarker, ReadPendingReviewMarker, ClearPendingReviewMarker. Previously they all used context.Background() internally, dropping cancellation and tracing from callers. 7. headHasReviewCheckpoint now logs at Debug on each failure step (locate worktree root, read HEAD, parse trailer, open repo, resolve summary, HasReview false) so users debugging "why didn't the review badge show up?" have breadcrumbs instead of a single silent false. Plus tests: - TestKindIsReview pins the IsReview invariant and forces future review kinds to be added to the disjunction. - TestSaveReviewConfig_ReturnsErrorOnMalformedSettings pins the data-loss regression fix. - TestDetectBaseBranch_PrefersAllRemotesOverLocals pins the #4 fix. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Entire-Checkpoint: 410590b32b74
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
2 participants
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.
This was added in initial experimenting to have a convenient way to start a new branch. It's mostly replicating what you would do with git so we remove this again.