gsxdsm
20184acdfd
FN-7486: fix no-diff merge recovery ownership checks
Fix no-op task branch recovery by recognizing canonical branches with no unique diff before rejecting inherited foreign trailers.
- Add no-diff ownership classification for already-merged detection when canonical task branches inherit another task's landed commit.
- Teach self-healing and branch-misbound recovery to ignore foreign branch-tip trailers only for branches proven to have no unique task diff.
- Skip synthetic verify:fast typechecks for JavaScript alias packages without tsconfig files and cover the behavior with tests.
- Add regression coverage and a patch changeset for the recovery fix.
Files changed:
.changeset/fn-7486-merge-recovery-noop-ownership.md | 7 ++
.../already-merged-detector.real-git.test.ts | 68 +++++++++++++++++
.../self-healing-already-merged.real-git.test.ts | 89 ++++++++++++++++++++--
packages/engine/src/already-merged-detector.ts | 88 +++++++++++++++------
packages/engine/src/self-healing.ts | 61 +++++++++++++--
scripts/__tests__/verify-fast.test.mjs | 16 +++-
scripts/verify-fast.mjs | 15 +++-
7 files changed, 303 insertions(+), 41 deletions(-)
Fusion-Task-Id: FN-7486
Fusion-Task-Lineage: 4185c6ed-9731-4ffc-b033-34bf0c3a83ad
Co-authored-by: Fusion (runfusion.ai) <noreply@runfusion.ai>
2026-07-03 22:04:45 -07:00
..
2026-07-03 22:04:45 -07:00
2026-04-24 19:39:20 -07:00
2026-07-03 13:10:20 -07:00
2026-04-13 16:35:06 -07:00
2026-07-03 13:10:20 -07:00
2026-06-08 15:19:27 -07:00
2026-07-02 11:38:31 -07:00