What problem does it solve? When two branches of an aiwf-tracked project independently allocate the same entity id and are then merged, aiwf check reports an ids-unique finding and the pre-push hook blocks the push. This Skill resolves that collision safely instead of leaving you to hand-edit frontmatter and break cross-references. ## Core Features & Use Cases - Automatic renumbering: Runs aiwf reallocate to pick the next free id (max + 1 across the working tree and trunk), git mv the colliding entity, and rewrite every reference field in other entities' frontmatter. - Trunk-ancestry tiebreaker: When an id is ambiguous, the side whose add commit is an ancestor of the trunk ref keeps the id; otherwise you pass a path to disambiguate. - Lineage preservation: Appends the old id to the entity's prior_ids list so aiwf history still returns the full timeline for both the old and new ids. - Use Case: After merging a teammate's branch, aiwf check fails with an ids-unique error on gap-7. Invoke this Skill to renumber one side, rewrite all milestone and gap references, and commit the fix with structured trailers. ## Quick Start Ask the AI to resolve the duplicate id reported by aiwf check by running aiwf reallocate on the colliding entity.
