agent: fix UpsertPeerSyncState call broken by the #80/#87 merge integration#90
Merged
Merged
Conversation
main stopped compiling (agent test package) once #76 (PR #80) and #77 (PR #87) both landed: #87 added the allowRewind parameter to UpsertPeerSyncState and updated every call site it could see, but #76 introduced agent/sync_test.go on a branch #87 never contained, so its call kept the old 4-arg signature. Git merged both cleanly (different files), but the integrated result doesn't build. Pass false (a first-contact watermark seed — no prior value to rewind from). https://claude.ai/code/session_01GV1qgPE2YcUnuoLvy566kj
There was a problem hiding this comment.
Pull request overview
Fixes a build break on main caused by integrating #80 and #87: agent/sync_test.go still called store.UpsertPeerSyncState with the pre-#87 signature, preventing go test / go vet from passing for the agent package.
Changes:
- Update the
UpsertPeerSyncStatecall inagent/sync_test.goto pass the newallowRewind boolparameter (false) to match the current store API.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
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
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.
Why
maindoes not compile after #80 (issue #76) and #87 (issue #77) both merged. Each PR was green in isolation, but they were never tested integrated:allowRewind boolparameter tostore.UpsertPeerSyncStateand updated every call site it could see.agent/sync_test.gowhose branch peer-sync metadata integrity: watermark/correlation history (H6) + folder-Merkle self-check (M2) #87 never contained, so itsUpsertPeerSyncStatecall kept the old 4-arg signature.Git merged both with no textual conflict (different files), but the integrated result fails to build:
go build ./...passes (the break is in a_test.gofile), so it slipped past a library-only check — butgo vet/go teston theagentpackage fail, i.e. CI onmainis red.Fix
One line: pass
false(the call seeds a first-contact watermark — there's no prior value to rewind from, so the production default applies). It is the onlyUpsertPeerSyncStatecall site still on the old signature; all others already pass the arg.Verify
With
rclonev1.74.1 onPATH(so the node integration tests actually run):go vet ./...clean,go test ./...fully green across all packages.https://claude.ai/code/session_01GV1qgPE2YcUnuoLvy566kj
Generated by Claude Code