fix(cli): retire pending rows a merge outdates; point identity rows at adjudicate - #1280
Merged
Merged
Conversation
jasonssdev
force-pushed
the
fix/1266-pending-rows
branch
from
October 2, 2026 22:42
e4cec75 to
63e1cb1
Compare
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
Two commits.
#1266 — pending rows outlive merged concepts; purge drops the queue silently
mergenow retires as stale every open pending row that names the absorbed concept, including an identity row over a larger group and relation_type rows (newpq.retire_open_naming, called fromqueue_resolution.resolve_merged). Open rows that do not name the absorbed id are untouched; rows already applied, declined or stale keep their state.test_merge_leaves_an_identity_row_over_a_different_member_set_openasserted the old behavior and now asserts the row goes stale.purge's notice now says thefindings.dbdrop also loses the whole pending-work queue and thatopenkos daemon --oncerebuilds it; thejobs.dbline now mentions the inbox watch history and that the next pass re-checks every inbox file. Purge stays warn-only.forgetalready swept the queue;unmergeis unchanged (the concept returns and the next pass recomputes its rows).#1265 (pending side)
pendingnow hintresolve: openkos adjudicate --apply (y merges, s skips, d records keep-distinct), with the keep-distinct command on anor:line; a group of more than two members is told thatadjudicate --applyprints the pairwise merge commands. Rows already judged "same" keep their hint.note: 50 is the per-run candidate cap, so more may exist; ..., namingduplicatesfor identity andsuggest-relationsfor relation_type. The queue records no truncation, so this is inferred from the row count: exactly 50 rows shows the note even when nothing was cut.Specs:
pending-work(merge-retire scenario, hint wording, cap-note requirement) andprivacy-purge(the two notice lines);docs/cli.mdpending and purge sections.Related issue
Closes #1266
Refs #1265
Type of change
feat— new featurefix— bug fixdocs— documentation onlyrefactor— no behavior changetest— tests onlychore/ci— tooling, build, or CIHow was this tested?
('pending', None) == ('stale', 'stale')), the purge notice, 4 hint failures intest_pending.py, and the cap note.>=→>in the cap check fails both cap tests.ruff check,ruff format --check,mypy .,pytest --cov(96.45%),evals/run_self_tests.py(46/46) pass locally.Checklist
ruff,mypy,pytest).