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

..

__tests__

FN-7486: fix no-diff merge recovery ownership checks

2026-07-03 22:04:45 -07:00

lib

FN-7415: Delete stale executor pause quarantine

2026-07-02 11:38:31 -07:00

assert-engine-slow-nonempty.mjs

test: close dashboard curated-gate and engine-slow coverage holes; add inventory harness

2026-06-03 17:36:35 -07:00

audit-branch-cross-contamination.mjs

fix(FN-4409): add merge-base fallback for contamination audit

2026-05-13 17:44:46 -07:00

audit-squash-merge.cmd

feat(FN-2690): add Windows cmd wrappers for script entrypoints

2026-04-27 08:21:48 -07:00

audit-squash-merge.mjs

feat(FN-4067): add squash audit gate to merger with integration tests

2026-05-12 07:47:11 -07:00

audit-task-id-collisions.mjs

feat(FN-4055): add task ID collision audit script and recovery documentatio

2026-05-12 17:04:33 -07:00

backfill-fn-4441-transition-evidence.mjs

feat(FN-4461): add transition evidence backfill script and tests

2026-05-14 05:07:03 -07:00

backfill-fn-5696-feature-assertions.mjs

FN-5696: backfill missing mission feature assertion links

2026-05-29 13:58:13 -07:00

boot-smoke.mjs

FN-6705: add plugin activation analytics

2026-06-19 16:47:33 -07:00

build-workspace.mjs

fix(build): make root workspace build run on Windows

2026-07-02 15:20:17 -07:00

cache-stats.mjs

fix(FN-4388): tighten cache-stats ephemeral filtering and tests

2026-05-13 22:41:30 -07:00

check-changeset-format.mjs

feat(changelog): U2 — changeset format linter + CI wiring

2026-06-23 23:30:32 -07:00

check-file-line-count.mjs

FN-7050: repair route and executor line ceilings

2026-06-25 23:34:08 -07:00

check-no-kill-4040.mjs

test: guard tests from killing the live dashboard port

2026-05-23 19:51:36 -07:00

check-no-nohup.mjs

feat(FN-5189): complete Step 5 — guard against nohup regressions

2026-05-19 17:19:03 -07:00

check-no-test-timeout-appeasement.mjs

FN-6434: block Vitest timeout appeasement

2026-06-14 15:29:35 -07:00

check-test-inventory.mjs

FN-6445: reject quality skip-list overlaps

2026-06-14 15:29:35 -07:00

check-test-isolation.cmd

feat(FN-2690): add Windows cmd wrappers for script entrypoints

2026-04-27 08:21:48 -07:00

check-test-isolation.mjs

test: quarantine slow and flaky test lanes

2026-06-13 19:22:00 -07:00

ci-distill-release-notes.mjs

feat(changelog): U5 — CI workflow distillation integration

2026-06-24 19:25:44 -07:00

ci-test-shard.mjs

Merge remote-tracking branch 'origin/main' into fix/test-timeout-failures

2026-06-13 15:44:28 -07:00

dev-hmr.cmd

feat(FN-2690): add Windows cmd wrappers for script entrypoints

2026-04-27 08:21:48 -07:00

dev-hmr.mjs

fix(FN-000): improve local startup UX

2026-05-11 09:52:23 +02:00

dev-with-memory-lib.mjs

fix(dev): rebuild core+engine+dashboard on dev/local startup + stale-dist check

2026-06-18 13:41:37 -07:00

dev-with-memory.cmd

feat(FN-2690): add Windows cmd wrappers for script entrypoints

2026-04-27 08:21:48 -07:00

dev-with-memory.mjs

fix(dev): rebuild core+engine+dashboard on dev/local startup + stale-dist check

2026-06-18 13:41:37 -07:00

ensure-test-artifacts.mjs

Build Compound Engineering plugin dist before its tests

2026-06-19 20:47:32 -07:00

ios-acceptance.mjs

FN-6667: add real iOS Safari acceptance harness

2026-06-18 16:47:09 -07:00

line-count-baseline.json

FN-7415: Delete stale executor pause quarantine

2026-07-02 11:38:31 -07:00

mobile-run-android.sh

fix(mobile): resolve Android status-bar overlap via safe-area plugin

2026-06-16 18:03:41 -07:00

reconcile-fn-3909-identity.mjs

feat(FN-4194): add reconciliation script for identity resolution

2026-05-12 17:04:33 -07:00

reconcile-leaked-soft-deletes.mjs

feat(FN-5175): thread soft-delete audit context and add reconciliation scri

2026-05-20 02:46:49 -07:00

reconcile-task-state-consistency.mjs

feat(FN-4000): add task state reconciliation script to fix stuck or inconsi

2026-05-11 06:47:43 -07:00

recover-stale-blocked-by.mjs

feat(FN-5528): add soft-delete exclusion to stale blocked-by recovery scrip

2026-05-23 03:33:53 -07:00

reimport-tasks.mjs

chore: add scripts/reimport-tasks.mjs recovery utility

2026-05-20 22:25:15 -07:00

release.cmd

feat(FN-2690): add Windows cmd wrappers for script entrypoints

2026-04-27 08:21:48 -07:00

release.mjs

feat(changelog): U4 — wire distillation into local release path

2026-06-24 19:25:38 -07:00

replace-seeded-workflow-prompts.mjs

chore(engine): remove workflow-step mock routing + stale FN-5482 docs

2026-05-23 03:09:00 -07:00

replace-ws006-prompt.mjs

feat(FN-4367): finalize structured workflow verdict contract

2026-05-14 11:15:47 -07:00

restore-merge-sha-fn-3878.mjs

feat(FN-3878): add restore-merge-sha script for commitSha restoration

2026-05-09 13:21:47 -07:00

run-ci-distill.mjs

feat(changelog): U5 — CI workflow distillation integration

2026-06-24 19:25:44 -07:00

run-script-tests.mjs

fix(FN-5048): address PR feedback on test verification

2026-06-21 10:53:08 -07:00

sign-linux.sh

feat(FN-5605): add linux gpg signing for release artifacts

2026-05-27 21:31:12 -07:00

sign-macos.sh

feat(KB-142): fix CLI native module packaging with lazy loading

2026-03-30 23:56:01 -07:00

sign-windows.ps1

feat(HAI-080): add code signing for macOS and Windows release binaries

2026-03-26 01:03:16 -04:00

start-local.mjs

feat: start engines by default

2026-06-20 23:57:37 -07:00

sync-fusion-skill-tools.cmd

feat(FN-2690): add Windows cmd wrappers for script entrypoints

2026-04-27 08:21:48 -07:00

sync-fusion-skill-tools.mjs

FN-7274: document workflow tools in Fusion skill

2026-06-30 08:04:12 -07:00

sync-workspace-version.mjs

fix(FN-XXX): sync workspace version on release

2026-04-29 08:15:38 -07:00

test-changed.mjs

fix: anchor rootDir at the git toplevel so subdir runs don't skip tests (#1785)

2026-06-25 22:56:10 -07:00

test-feedback-baseline.mjs

FN-7463: refresh test feedback baseline docs

2026-07-03 07:47:03 -07:00

test-timings.json

FN-7415: Delete stale executor pause quarantine

2026-07-02 11:38:31 -07:00

test-value-audit.mjs

chore: add test value audit (deletion-candidate evidence base)

2026-06-25 17:04:30 -07:00

test-velocity-baseline.mjs

FN-6966: flag stale timing metadata in velocity reports

2026-06-24 23:32:52 -07:00

test-velocity-history.json

FN-7414: refresh test velocity quarantine baseline

2026-07-02 11:38:31 -07:00

test-with-lock.mjs

feat(FN-3234): refactor test-changed script and add workflow tests

2026-05-03 05:47:11 -07:00

verify-fast.mjs

FN-7486: fix no-diff merge recovery ownership checks

2026-07-03 22:04:45 -07:00

workflow-reliability-release-check.mjs

FN-6694: add workflow reliability release-check harness

2026-06-19 05:13:39 -07:00