gsxdsm 0c0839eeb6 fix(merger): retry on non-FF ref-advance instead of failing the task (FN-5576) ...

When the squash commit was built off a stale integration tip, the FF guard
in advanceIntegrationBranchRef refused the swap with reason
`non-fast-forward-advance` — but the caller only mapped `concurrent-advance`
to IntegrationBranchConcurrentAdvanceError, so the non-FF case fell through
as a plain Error and failed the task. Both reasons share a root cause
(integration moved during the merge window), so they now share the
FN-4500/FN-5083 rebind/retry path.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

2026-05-23 19:56:37 -07:00

..

android-chat-keyboard-dismiss.md

fix(dashboard): don't preventDefault on chat composer touchstart on Android

2026-05-22 16:00:02 -07:00

android-keyboard-and-zoom.md

fix(dashboard): keep Android keyboard open in main chat; disable kanban pinch-zoom

2026-05-22 14:07:15 -07:00

config.json

feat(tui+release): persist vitest memory guard, aggregate root CHANGELOG, lockstep all packages

2026-04-25 09:09:31 -07:00

dashboard-pull-syncs-to-local-tip.md

fix(dashboard): pull syncs the worktree to local integration tip, not just to origin

2026-05-23 18:23:24 -07:00

engine-singleton-lock.md

feat(engine): guard one engine per project per machine

2026-05-19 22:50:39 -07:00

engine-smart-pull-library.md

feat(engine): export smartPull() library for stash-aware fast-forward

2026-05-23 14:26:57 -07:00

executor-preflight-stale-and-reliability-serialize.md

fix(executor+engine-tests): preflight premise-stale exit and serialize reliability suite

2026-05-22 22:26:18 -07:00

executor-premise-stale-bypass.md

fix(executor): bypass summary-incomplete refusal for PREMISE STALE: summaries

2026-05-22 22:34:32 -07:00

feat-fusion-coauthor-trailer.md

feat: attribute Fusion as Co-authored-by trailer instead of primary author

2026-05-22 20:38:11 -07:00

feat-git-manager-sync-working-tree.md

fix(dashboard): useMergeAdvanceNotice tests should waitFor toBeDefined

2026-05-23 18:39:36 -07:00

fix-android-mobile-chrome-overlaps.md

fix(dashboard-mobile): clear Android status bar, footer-nav overlap, fetch toast spam

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

fix-android-nav-gesture-overlap.md

fix(dashboard): floor mobile nav inset so Android Chrome gesture bar can't overlap

2026-05-22 20:48:09 -07:00

fix-android-tablet-viewport.md

fix(dashboard): unsqueeze board on Android tablets

2026-05-21 23:05:15 -07:00

fix-dashboard-pull-autostash.md

fix(dashboard): autostash dirty working tree across git pull and surface reapply conflicts

2026-05-20 14:28:36 -07:00

fix-engine-audit-promoted-foreign.md

fix(engine): skip promoted-foreign commits in contamination audit

2026-05-23 02:59:23 -07:00

fix-engine-bootstrap-misbinding-fallback.md

fix(engine): un-deadcode bootstrap-misbinding auto-recovery fallback

2026-05-23 02:29:38 -07:00

fix-engine-resume-misbinding-verify.md

fix(engine): verify resumed worktrees aren't bootstrap-misbound

2026-05-23 02:32:01 -07:00

fix-engine-test-isolation-and-subprocess-timeout.md

fix(engine-tests): eliminate temp-dir leak and raise subprocess guard for concurrent workspace runs

2026-05-22 20:20:42 -07:00

fix-fn-5256-cycle-check-empty-deps.md

fix(FN-5256): skip cycle preflight when new task has no deps

2026-05-21 06:40:15 -07:00

fix-fn-5256-worktree-liveness.md

fix(FN-5256): await disposal across task:moved-away and task:deleted

2026-05-21 10:14:38 -07:00

fix-fn-5279-reuse-mode-push.md

fix(FN-5279): apply reuse-mode squash to local main and guard executor-lease race

2026-05-20 14:28:19 -07:00

fix-fn-5345-empty-commit-and-empty-own-diff-finalize.md

fix(FN-5345): address code-review findings on engine fixes

2026-05-20 17:54:26 -07:00

fix-fn-5407-backup-checkpoint-truncate.md

fix(FN-5407): stop checkpoint-truncating live DB during backup

2026-05-20 22:09:30 -07:00

fix-fn-5456-branch-autocorrect-no-create-from-head.md

fix(FN-5456): never create task branches from arbitrary HEAD in autocorrect

2026-05-22 21:36:02 -07:00

fix-fn-5483-identity-guard-merger-bypass.md

feat(FN-5479): fix identity-guard merger bypass on detached HEAD and gate l

2026-05-22 08:31:12 -07:00

fix-git-manager-dedup-and-local-sync.md

fix(dashboard): remove duplicate integration-advances UI; Sync working tree skips origin

2026-05-23 19:24:35 -07:00

fix-handoff-clear-queued-state.md

fix: scrub queued/blockedBy/overlapBlockedBy on in-review transition

2026-05-21 11:08:14 -07:00

fix-handoff-reattach-authoritative-branch.md

fix(engine): auto-reattach HEAD at handoff when branch ref is authoritative

2026-05-21 19:03:35 -07:00

fix-health-refresh-rerun-integrity-check.md

fix(health): re-run integrity check on Refresh health, not just re-read cache

2026-05-20 23:02:53 -07:00

fix-merger-dirty-worktree-autostash.md

fix(merger): autostash dirty reuse worktrees and fail loudly on autostash errors

2026-05-22 14:38:29 -07:00

fix-merger-fake-done-sibling-branch.md

fix(merger): prevent tasks landing in Done with no commit on main

2026-05-23 17:16:45 -07:00

fix-merger-lost-work-guard.md

fix(merger): refuse no-op finalize when modifiedFiles claims work was done

2026-05-23 17:42:21 -07:00

fix-mobile-nav-keyboard-shift.md

fix(dashboard): keep mobile nav bar pinned when iOS keyboard opens

2026-05-23 02:50:37 -07:00

fix-phantom-finalize-diagnostic-reset.md

fix(engine): surface phantom-finalize cause and reset HEAD when branch is authoritative

2026-05-21 19:10:24 -07:00

fix-post-session-branch-attribution-audit.md

feat(engine): post-session branch attribution audit

2026-05-21 19:20:33 -07:00

fix-subprocess-guard-cross-test-timer-leak.md

fix(test-utils): cancel subprocess tracking timer for every proc in afterEach

2026-05-22 18:38:51 -07:00

fix-tablet-board-squeeze.md

fix(dashboard): unsqueeze kanban columns on tablet viewports

2026-05-22 17:22:36 -07:00

fix-task-persist-null-description.md

fix(core): default null task.description to empty string on persist

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

fix-worktree-pool-branch-contamination.md

fix(engine): harden worktree-pool branch creation and auto-reanchor foreign-only contamination

2026-05-22 04:13:15 -07:00

fn-5241-atomic-in-review-handoff.md

feat(FN-5241): add atomic in-review handoff seam with executor/self-healing

2026-05-20 01:01:08 -07:00

fn-5271-precommit-branch-case.md

feat(FN-5271): add precommit identity guard for worktree hooks

2026-05-20 06:42:05 -07:00

fn-5279-merge-integration-worktree.md

feat(FN-5279): add merge integration worktree feature with settings UI and

2026-05-20 09:42:40 -07:00

fn-5291-file-scope-warning-only.md

fix(FN-5291): downgrade file-scope invariant failures

2026-05-19 23:00:11 -07:00

fn-5320-worktrunk-canonical-upstream.md

feat(FN-5320): canonicalize worktrunk binary name and manifest

2026-05-20 07:44:57 -07:00

fn-5321-external-integration-checklist.md

feat(FN-5321): add evidence gap detector for external integration manifests

2026-05-20 15:54:44 -07:00

fn-5322-main-chat-composer-expand-fix.md

feat(FN-5322): fix main chat composer flex sizing and expand behavior

2026-05-20 07:20:01 -07:00

fn-5329-remove-branch-recovery.md

feat(FN-5329): remove orphan rescue and branch-recovery primitives from eng

2026-05-20 16:43:27 -07:00

fn-5335-backward-move-triple-proof.md

fix(FN-5335): enforce triple-proof gating for backward recovery

2026-05-21 19:15:27 -07:00

fn-5337-remove-speculative-orphan-requeue.md

feat(FN-5337): remove speculative orphan requeue from self-healing sweep

2026-05-20 18:49:38 -07:00

fn-5347-manual-retry-counter-reset.md

feat(FN-5347): reset manual retry counters across task retry surfaces

2026-05-21 15:45:48 -07:00

fn-5353-merge-reuse-stall-fix.md

feat(FN-5353): fix merge-reuse handoff race by gating reacquire and strict

2026-05-21 15:30:13 -07:00

fn-5374-room-chat-retention.md

feat(FN-5374): raise room transcript defaults and align compaction settings

2026-05-21 07:05:48 -07:00

fn-5375-cloudflared-manifest.md

feat(FN-5375): enforce manifest-gated cloudflared checksum installation

2026-05-20 18:43:17 -07:00

fn-5411-project-identity-recovery.md

feat(FN-5411): add project identity recovery and identity-aware startup rea

2026-05-23 04:18:55 -07:00

fn-5413-null-description-persist.md

feat(FN-5413): add null description persist regression test

2026-05-21 08:20:42 -07:00

fn-5496-soft-deleted-blocker-recovery.md

feat(FN-5496): reconcile soft-deleted tasks with active blockers

2026-05-22 10:58:44 -07:00

fn-5513-exhausted-in-review-visibility.md

feat(FN-5513): merge fusion/fn-5513

2026-05-22 16:10:13 -07:00

fn-5519-windows-worktree-mkdir.md

feat(FN-5519): merge fusion/fn-5519

2026-05-22 22:43:26 -07:00

FN-5170-archive-extraction.md

fix(FN-5170): use in-process tar extraction for company imports

2026-05-19 23:55:58 -07:00

FN-5171-cli-near-duplicate.md

feat(FN-5171): add near-duplicate task guard to CLI create command

2026-05-20 00:41:33 -07:00

FN-5216-file-scope-duplicate-sanitize.md

feat(FN-5216): sanitize duplicate paths in file scope when parsing task sto

2026-05-20 06:14:47 -07:00

FN-5220-explicit-duplicate-marker-guard.md

feat(FN-5220): guard explicit duplicate markers in triage and self-healing

2026-05-20 14:28:45 -07:00

FN-5226-scope-auto-widen.md

feat(FN-5226): add scope auto-widen layer 2.5 to merger for attribution-bas

2026-05-21 16:30:31 -07:00

FN-5255-default-squash.md

feat(FN-5255): flip directMergeCommitStrategy default from squash to direct

2026-05-23 11:08:08 -07:00

FN-5284-db-corruption-surfacing.md

feat(FN-5284): surface db corruption via health checks, self-healing, and d

2026-05-20 04:13:43 -07:00

FN-5407-central-db-backup.md

feat(FN-5407): add paired central backup support to backup command and stor

2026-05-20 20:05:08 -07:00

FN-5414-heartbeat-multiplier-unresponsive.md

feat(FN-5414): merge fusion/fn-5414

2026-05-20 20:15:43 -07:00

FN-5424-opencode-go-refresh.md

feat(FN-5424): add opencode-go provider to settings with model refresh on k

2026-05-20 22:34:32 -07:00

FN-5425-multi-agent-room-task-filing.md

feat(FN-5425): add coordination notice system for multi-agent room task fil

2026-05-21 00:17:33 -07:00

FN-5438-manual-merge-bypass-queued.md

feat(FN-5438): add manual merge blocker bypass mode for queued tasks

2026-05-21 18:29:03 -07:00

FN-5455-pr-mode-pool-lease-release.md

feat(FN-5455): merge fusion/fn-5455

2026-05-22 21:08:00 -07:00

FN-5544-run-audit-session-runtime-resolved.md

feat(FN-5544): emit runtime-resolved audit event across engine lanes

2026-05-23 12:14:07 -07:00

git-manager-extended-status.md

feat(dashboard): extended integration-branch status in Git Manager

2026-05-23 16:38:00 -07:00

git-status-and-settings-review-fixes.md

fix(dashboard): close 8 review findings on git-status + integration-branch setting

2026-05-23 17:10:59 -07:00

git-status-review-followup.md

fix(dashboard): close 7 review findings on extended-status hardening

2026-05-23 17:31:39 -07:00

integration-branch-dropdown.md

feat(dashboard): Integration branch is a dropdown of local branches + Custom…

2026-05-23 16:44:47 -07:00

integration-branch-settings-ui.md

feat(dashboard): expose integrationBranch setting in the settings modal

2026-05-23 16:31:48 -07:00

merge-advance-auto-sync-setting.md

feat(core): add mergeAdvanceAutoSync project setting

2026-05-23 14:19:50 -07:00

merge-advance-auto-sync-settings-ui.md

feat(dashboard): expose mergeAdvanceAutoSync in the project settings modal

2026-05-23 15:50:03 -07:00

merge-advance-notice-dismiss-and-autosync-suppression.md

fix(dashboard): unbreak banner dismiss + suppress when auto-sync handled it

2026-05-23 15:57:48 -07:00

merge-advance-notice-render-fix.md

fix(dashboard): preserve store this-binding in merge-advance-events endpoint

2026-05-23 14:16:36 -07:00

merger-auto-sync-hook.md

feat(engine): merger auto-syncs project-root checkout after ref advance

2026-05-23 14:41:11 -07:00

merger-auto-sync-review-fixes.md

fix(engine,dashboard): close 7 review findings on merger auto-sync

2026-05-23 15:13:17 -07:00

merger-ff-only-ref-advance.md

fix(merger): require fast-forward ref advances and read integration tip from refs/heads/<branch>

2026-05-23 09:49:34 -07:00

merger-non-ff-retry-as-concurrent.md

fix(merger): retry on non-FF ref-advance instead of failing the task (FN-5576)

2026-05-23 19:56:37 -07:00

merger-orphan-rehome-auto-recovery.md

feat(merger): auto-rehome FF-recoverable orphan commits in contamination recovery

2026-05-23 09:59:50 -07:00

mobile-icb-compensation.md

fix(dashboard): compensate Android Chrome inflated ICB for fixed-position UI

2026-05-22 13:55:20 -07:00

mobile-nav-bar-pin-on-keyboard.md

fix(dashboard): pin mobile nav bar to page bottom when keyboard is open

2026-05-23 09:45:30 -07:00

mobile-viewport-android-fixes.md

fix(dashboard): keep mobile nav visible on Android landscape and during keyboard

2026-05-22 13:12:36 -07:00

parent-task-dedup-intake.md

fix(engine,core): dedup heartbeat-spawned follow-ups by parent task

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

scope-merger-verification.md

fix(merger): short-circuit out-of-scope fix loop to prevent limbo recovery cycle

2026-05-22 21:32:10 -07:00

test-guard-no-kill-live-port.md

test: guard tests from killing the live dashboard port

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