# Roadmap: DeerFlow Frontend Merge Recovery

**Created:** 2026-04-07
**Source:** .planning/PROJECT.md + .planning/REQUIREMENTS.md

## Phase 1: Conflict Inventory and Decision Matrix

**Goal:** Build an auditable conflict inventory covering merge-overwritten regions, Titan-overlap regions, and keep/replace candidates.

**Covers:** MERGE-01, MERGE-03

- Produce file-level conflict matrix with risk levels
- Mark visual-only, logic-only, and mixed-change files
- Identify Titan-linked hotspots and expected behavior per hotspot

## Phase 2: Thread and Skills Logic Reconciliation

**Goal:** Reconcile thread bootstrap/routing and skills API logic so merged behavior is explicit and stable.

**Covers:** MERGE-02, LOGIC-03, LOGIC-04

- Reconcile `thread_id`/`isnew`/`xclaw_used` behavior in chat flow
- Decide and implement skills bootstrap contract direction
- Verify no duplicate or dead logic paths remain

## Phase 3: Legacy Visual Alignment Pass

**Goal:** Align workspace visual presentation to legacy baseline without regressing logic.

**Covers:** UI-01, UI-02, UI-03

- Apply visual alignment in layout and component layers
- Keep behavioral code intact while adjusting style semantics
- Validate visual consistency across core workspace views

## Phase 4: Iframe + Markdown New-System Stabilization

**Goal:** Keep and harden new-system capabilities for iframe communication and markdown export.

**Covers:** LOGIC-01, LOGIC-02

- Stabilize parent/child messaging and selected-skill event flows
- Stabilize markdown conversion and download triggers
- Validate artifact integration points

## Phase 5: Test Hardening and Commit Hygiene

**Goal:** Lock recovery with regression tests and clean commit structure.

**Covers:** TEST-01, TEST-02, TEST-03

- Finalize and run E2E suite for target scenarios
- Split commits into style / logic / tests concern buckets
- Attach reviewer-oriented verification notes for high-risk files

---
*Next command:* `/gsd-plan-phase 1`