Fusion 162f4daa62 feat(FN-4098): document branch conflict recovery feature ...

Adds documentation for branch conflict recovery (FN-4098), covering the new CLI command, executor branch rename setting, recovery workflow, and delivery artifacts across the CLI reference, settings reference, and task management docs, with a changeset for the `@runfusion/fusion` package.

Fusion-Task-Id: FN-4098

2026-05-12 19:21:58 -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

fix-fn-task-done-paused-state.md

feat(FN-4068): add branch conflict detection and recovery for stale worktre

2026-05-12 17:14:29 -07:00

fix-github-tracking-gh-cli-create.md

feat(FN-4116): fix github tracking issue creation

2026-05-12 08:28:44 -07:00

fix-task-json-tmp-race.md

fix(FN-4122): use unique tmp filename for task.json atomic writes

2026-05-12 09:41:43 -07:00

fn-001-mobile-board-corner-fix.md

feat(FN-001): complete Step 4 — changeset

2026-05-12 23:27:43 +08:00

fn-4068-branch-conflict-recovery.md

feat(FN-4068): add branch conflict detection and recovery for stale worktre

2026-05-12 17:14:29 -07:00

fn-4069-direct-merge-routing.md

feat(FN-4069): add direct merge commit routing to merger

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

fn-4071-overlap-guard.md

feat(FN-4071): add overlap guard to prevent concurrent merge conflicts

2026-05-12 09:06:54 -07:00

fn-4072-diff-volume-gate.md

feat(FN-4072): add diff volume gate to merger

2026-05-12 18:26:58 -07:00

fn-4091-stale-overlap-blockers.md

feat(FN-4091): fix stale blocker in WorkflowResultsTab

2026-05-12 17:24:44 -07:00

fn-4098-branch-recovery-docs.md

feat(FN-4098): document branch conflict recovery feature

2026-05-12 19:21:58 -07:00

fn-4117-mention-popup-mobile.md

fix(FN-4117): render mobile mention popup above the composer

2026-05-12 08:28:44 -07:00

fn-4118-chat-room-scroll-on-return.md

feat(FN-4118): restore last viewed room thread on chat load

2026-05-12 09:20:39 -07:00

fn-4120-mobile-chat-search.md

feat(FN-4120): add mobile chat search to ChatView

2026-05-12 09:13:52 -07:00

fn-4122-fanout-badge-label.md

feat(FN-4122): simplify fan-out badge label, inherit count color from paren

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

fn-4128-dependency-graph-error-state.md

feat(FN-4128): fix bundled plugin entry resolution and surface load errors

2026-05-12 17:03:10 -07:00

fn-4130-zero-step-retry-classification.md

feat(FN-4130): classify zero-step tasks as retryable to todo on failure

2026-05-12 10:27:36 -07:00

fn-4132-agent-task-reassignment-sync.md

feat(FN-4132): sync task ownership on agent reassignment

2026-05-12 10:27:36 -07:00

fn-4133-dockerode-lazy-load.md

feat(FN-4133): lazy-load dockerode in DockerClientService

2026-05-12 18:33:13 -07:00

fn-4134-research-view-layout-fix.md

feat(FN-4068): add branch conflict detection and recovery for stale worktre

2026-05-12 17:14:29 -07:00

fn-4135-always-on-web-search.md

feat(FN-4135): add always-on web search with locked provider setting

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

fn-4139-mobile-swipe-back.md

feat(FN-4139): add swipe-back navigation to chat, mission, and planning flo

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

fn-4144-github-link-card-icon.md

feat(FN-4144): add GitHub tracking indicator to task cards

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

fn-4145-clear-task-pause-on-done.md

feat(FN-4145): clear task pause state when fn_task_done is received

2026-05-12 17:59:59 -07:00

fn-4147-github-tracking-enable-button.md

feat(FN-4147): add mobile-friendly github tracking enable button in header

2026-05-12 10:27:36 -07:00

fn-4148-derive-github-tracking-title.md

feat(FN-4148): derive GitHub tracking titles from task descriptions

2026-05-12 17:03:10 -07:00

fn-4151-github-tracking-mobile-layout.md

feat(FN-4151): add mobile layout contract test for inline editing integrati

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

fn-4159-shrink-github-tracking-enable-button.md

feat(FN-4159): shrink and keep visible the github tracking enable button in

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

fn-4161-github-tracking-restart.md

feat(FN-4161): preserve github tracking detail after restart

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

fn-4176-github-tracking-in-general.md

feat(FN-4176): add general GitHub tracking settings to settings modal

2026-05-12 17:46:18 -07:00

fn-4177-heartbeat-room-messages.md

feat(FN-4177): add heartbeat messaging support for chat rooms

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

fn-4178-room-message-notification.md

feat(FN-4178): add room message notification delivery

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

fn-4180-room-context-compaction.md

feat(FN-4180): compact room transcript context to reduce token usage

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

fn-4183-github-tracking-chevron-alignment.md

feat(FN-4183): align detail source header in TaskDetailModal

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

fn-4184-no-untitled-tracking-issue.md

feat(FN-4184): defer untitled issues in github-tracking until they receive

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

fn-4189-chat-entry-grows.md

feat(FN-4189): lift chat input height cap and add autosize behavior

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

fn-4192-task-id-integrity-alerts.md

feat(FN-4192): add task ID integrity detection and dashboard alerts

2026-05-12 19:10:07 -07:00

fn-4200-overlap-guard-failed-tasks.md

feat(FN-4200): prevent failed tasks from blocking overlap dispatch in sched

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

fn-4213-github-tracking-header-single-row.md

feat(FN-4213): keep github tracking header aligned to single row

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

fn-4224-github-tracking-header-compact.md

feat(FN-4224): tighten github tracking header to single-row layout in task

2026-05-12 17:34:26 -07:00

FN-4106-workflow-summary-append.md

feat(FN-4106): preserve rerun summaries in executor task-done output

2026-05-12 08:28:44 -07:00

FN-4107-chat-draft-persistence.md

feat(FN-4107): persist chat draft auto-save in ChatView

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

FN-4119-stale-heartbeat-reaper.md

feat(FN-4119): add stale heartbeat run reaper to prevent engine blockage

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

FN-4123-quick-chat-latest-session.md

feat(FN-4123): restore latest quick chat session on startup

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

FN-4127-ntfy-encoding.md

fix(FN-4127): harden ntfy notification delivery

2026-05-12 09:41:24 -07:00

FN-4129-wheel-pan.md

feat(FN-4129): add wheel pan and modifier-key zoom to dependency graph

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

FN-4142-github-tracking-done-comment.md

feat(FN-4142): enrich GitHub tracking comments with done status

2026-05-12 09:32:50 -07:00

FN-4160-oauth-manual-code-warning.md

feat(FN-4160): warn before OAuth login when manual code mode is active

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

FN-4179-clear-room-composer.md

feat(FN-4179): optimistically clear room composer on send

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

FN-4182-mobile-send-button.md

feat(FN-4182): keep keyboard open on first tap of mobile room send button

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

FN-4185-open-new-room.md

feat(FN-4224): tighten github tracking header to single-row layout in task

2026-05-12 17:34:26 -07:00