fix(openviking): harden session sync and commit recovery - #69191
Merged
Conversation
Preserve ordered structured turns across OpenViking's 100-message batch limit and resume retries from the first unconfirmed message. Based on the OpenViking batching work from commit 1a567f7 in NousResearch#58981.
- Remove dead current_sid parameter from _recover_pending_sessions - Remove dead cleanup parameter from _release_owner_run_claim (always True) - Set _run_lock_path after flock succeeds, not before - Collapse redundant BlockingIOError branch (covered by OSError+errno check) - Track _pending_marked_sids to skip re-writing marker file on every sync_turn
kshitijk4poor
enabled auto-merge (rebase)
July 22, 2026 08:32
This was referenced Jul 22, 2026
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.
Summary
Salvages #58871 with minor cleanup: dead parameters removed, lock-path assignment reordered, redundant exception branch collapsed, and per-turn marker re-writes eliminated.
Changes
current_sidparam from_recover_pending_sessions; removed deadcleanupparam from_release_owner_run_claim(always True); set_run_lock_pathafterflocksucceeds; collapsedBlockingIOErrorbranch intoOSError+errno check; added_pending_marked_sidsset to skip re-writing marker file on everysync_turncall_recover_pending_sessionscall (no args)Attribution
Validation
Supersedes
initialize()afterself._session_idis setCloses #58871, #31434, #31493