fix(followups): structural merge driver (#391) + untracked FU-id warning (#392) - #405
Merged
Merged
Conversation
…racked FU-id validation warning (#392) #391: the follow-ups registry is a single CLI-owned file, so every parallel PR touching it conflicts, and resolving textually (take one side, re-run drift --apply) silently reverted the other side's closures — statuses live only in the file and re-extraction renumbers ids. - New `straymark followups merge-driver <base> <ours> <theirs>`: git merge driver that reconciles structurally. Entries match by title (ids are positional); higher-rank status wins so closures made on either side survive; theirs-only entries appended (renumbered on collision); deletions respected unless ours changed the status; Notes unions append-only extensions; frontmatter recomputed. - drift --apply skips candidates whose normalized title already exists in the registry, so a declaration that moved section cannot spawn a duplicate open entry shadowing the operator's status. #392: validate now warns (FOLLOWUP-UNTRACKED-ID) when an AILOG body mentions a FU-NNN / FU-NNN-NNN id outside its own ## Follow-ups section — where the extractor cannot see it — and that id is not in the registry. Registered ids (cross-references) stay quiet; the check is warn-only and skipped when the project has no registry. Docs: CLI-REFERENCE en/es/zh-CN + FOLLOW-UPS-BACKLOG-PATTERN.md. Folded in: /.qoder/ gitignore (local agent config, mirrors /.claude/). Self-adoption: AILOG-2026-08-04-003 + seeded follow-ups registry via drift --apply.
2 tasks
montfort
added a commit
that referenced
this pull request
Aug 5, 2026
Releases the three adopter-triage batches (PRs #403, #404, #405): nine issues remediated. Framework touched in all three (telemetry schema + charter templates, .qoder/skills + manifest, backlog pattern doc) → minor fw bump; CLI gains followups merge-driver (#391), the FOLLOWUP-UNTRACKED-ID validate warning (#392) and Qoder skills (#399) → minor CLI bump (docs already cite cli-3.41.0 for these features). Version tables updated in README + CLI-REFERENCE (en/es/zh-CN); CHANGELOG entry summarizes all nine fixes.
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
Third batch from the 2026-08-04 open-issue triage (one PR per batch, per agreement).
.straymark/follow-ups-backlog.mdis a single CLI-owned file, so every concurrent PR touching follow-ups conflicts on it, and the textual resolution (take one side, re-rundrift --apply) silently reverted the other side's closures — statuses live only in the file, and re-extraction renumbers ids, so even comparing ids cannot detect the loss. Fixed two ways:straymark followups merge-driver <base> <ours> <theirs>: a git merge driver that reconciles structurally. Entries match by title (ids are positional and do not survive regeneration); the higher-rank status wins (open<in-progress<suspected-closed<closed/superseded/promoted), so a closure made on either side survives; equal-rank disagreements keepoursand are reported on stderr. Theirs-only entries are appended (renumbered on id collision), deletions respected unlessourschanged the entry's status,Notesunions append-only extensions, frontmatter recomputed. Exit code follows git's driver contract.drift --applyskips candidates whose normalized title already exists in the registry, so a declaration that moved section (or a re-extraction after conflict resolution) cannot spawn a duplicateopenentry shadowing the operator's status.## Follow-upsis invisible to the extractor and nothing warns #392 — FU ids declared outside## Follow-upswere invisible to the extractor with no warning.validatenow emits a warn-onlyFOLLOWUP-UNTRACKED-IDwhen an AILOG body mentions aFU-NNN/FU-NNN-NNNid outside its own## Follow-upssection and that id is not in the registry. Registered ids (cross-references) stay quiet; the check is skipped entirely when the project has no registry.FOLLOW-UPS-BACKLOG-PATTERN.md(new "Parallel PRs — structural merge" subsection)./.qoder/gitignore (local agent config, mirrors/.claude/).drift --apply. Note: with a registry present, the new rule surfaces 5 pre-existing warn-only cross-references in historical AILOGs (Weft-registry ids) — advisory, as designed.Test plan
cargo test --no-fail-fastincli/: all suites green except the pre-existingaudit_template_test::unified_template_has_seven_universal_sectionsfailure (documented in AILOG-2026-08-04-001 R1)straymark validateon this repo: 0 errorsCloses #391
Closes #392