Repository navigation
fix(ok): one authority for document conflicts (PRD-8318, PRD-7947) (#4102) - #28
Merged
Merged
Conversation
…4102) * fix(ok): use one conflict authority (PRD-8318, PRD-7947) * fix(ok): preserve conflict snapshots and canonical paths * refactor(ok): drop review-round accretion from the conflict authority Keeps the one-authority design and both fixes (PRD-8318, PRD-7947) and removes what neither ticket needed: - revision optimistic concurrency: StaleConflictError, the stale-conflict URN, ledger version 3, the required wire field, and the MCP refusal of revision-less servers. The ledger is version 2 and migrates version 1. - the fail-closed editor gate: the editor no longer waits on the conflicts fetch. Retry ladder, Retry panel, focus restore, sidebar announcements, and the file-tree trash gate are gone. The server still refuses writes on a conflicted doc and the sync-status signal swaps the view when a conflict arrives. - raise/dissolve outcome enums, docConflictState, the persistFailures counter, the required lifecycleOf option and its 37 no-op fixtures, and the capture options object on refuseStaleExternalWrite. - the prune-await harness, folded into the server-factory authority test. - the unrelated file-watcher root-event fix and the hook stdin-drain test and runbook section, saved as patches under tmp/split-out for their own PRs. The two-line hook reorder stays so CI is unchanged. - two doc regressions (mcp.mdx import row, skills link), the triplicated resolution paragraph, and the inline spec corrigenda. The DiffViewBoundary stage fetch keys on file and detectedAt again, as on main, so a conflict re-raised on the same file refetches. * docs(ok): tighten the conflict authority prose Rewrote the passive and hedged sentences in this branch's conflict docs into active voice, split the densest ones, and cut the filler. No facts changed: the kinds, refusal values, ledger behavior, and error semantics all read the same. * docs(ok): fit the conflict authority changeset in the word budget * fix(ok): preserve live conflict edits and recover invalid ledgers * test(ok): supply conflict authority to remaining sync fixtures GitOrigin-RevId: 057c7d709eda6cb092bfd314ab1b57e0b91fd5e4
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.
Copybara-translated 1 Inkeep OSS change. Rebase-merge this PR so the prepared commit lands directly on public main.
Linear: this mirror replays a change that already merged upstream, so it must not drive ticket status.
skip PRD-8318
skip PRD-7947