Codex/ade phase 4 5

[arul28]

Summary by CodeRabbit

• New Features

  • Conflict prediction and risk matrix visualization across lanes
  • Lane hierarchy support with parent-child relationships and restacking
  • Lane appearance customization (colors, icons, tags)
  • Merge simulation between lanes with conflict preview
  • Graph visualization for lane relationships and stack structure
  • Lane overlay policies for granular configuration control

• UI/UX Enhancements

  • Conflict radar interface with risk indicators
  • Stack graph visualization in lane management
  • Modal-based text prompts replacing browser prompts

[coderabbitai]

Caution

Review failed

The pull request is closed.

📝 Walkthrough

Walkthrough

This pull request introduces comprehensive conflict prediction and lane hierarchy management features, including a new conflict service with risk assessment, lane parent-child relationships, lane overlay policies for configuration, and a graph visualization page. New IPC endpoints, database schema, and extensive UI components support these capabilities across the desktop application.

Changes

Cohort / File(s)	Summary
Conflict Service & Prediction apps/desktop/src/main/services/conflicts/conflictService.ts, apps/desktop/src/main/services/git/git.ts	New conflict service providing prediction, risk assessment, and overlap tracking; adds Git merge-tree support with conflict parsing and fallback logic.
Lane Hierarchy & Operations apps/desktop/src/main/services/lanes/laneService.ts	Substantially expands lane service with parent-child relationships, reparent, restack, stack chains, and appearance customization; adds worktree-based lane creation and deep HEAD SHA resolution.
Configuration & Overlay Policies apps/desktop/src/main/services/config/projectConfigService.ts, apps/desktop/src/main/services/config/laneOverlayMatcher.ts	Introduces lane overlay policies with pattern matching, validation, and deep merging across shared/local configs; adds policy-based environment and cwd overrides.
Service Integration & Coordination apps/desktop/src/main/main.ts, apps/desktop/src/main/services/jobs/jobEngine.ts, apps/desktop/src/main/services/git/gitOperationsService.ts	Wires conflict service and job engine as first-class services; adds conflict prediction queuing, periodic scheduling, and worktree mutation callbacks throughout service chain.
Process & Test Service Overlays apps/desktop/src/main/services/processes/processService.ts, apps/desktop/src/main/services/tests/testService.ts, apps/desktop/src/main/services/pty/ptyService.ts	Integrates lane overlay policies into process/test execution flow; adds shell fallback mechanism with candidate list for cross-platform compatibility.
File & State Management apps/desktop/src/main/services/files/fileService.ts, apps/desktop/src/main/services/state/kvDb.ts	Adds lane mutation callbacks to file service; extends database with parent lane references, lane appearance columns, and conflict predictions table with indices.
IPC & Public API Surface apps/desktop/src/main/services/ipc/registerIpc.ts, apps/desktop/src/shared/ipc.ts, apps/desktop/src/preload/global.d.ts, apps/desktop/src/preload/preload.ts	Exposes 13 new IPC channels for conflict queries, lane operations, and graph state persistence; extends preload API with conflicts namespace, lane hierarchy methods, and graph state endpoints.
Conflict UI Components apps/desktop/src/renderer/components/conflicts/ConflictsPage.tsx, apps/desktop/src/renderer/components/conflicts/RiskMatrix.tsx, apps/desktop/src/renderer/components/conflicts/MergeSimulationPanel.tsx, apps/desktop/src/renderer/components/conflicts/ConflictFileDiff.tsx, apps/desktop/src/renderer/components/conflicts/...	Comprehensive conflict radar UI with risk matrix, merge simulation, conflict file diff viewer with Monaco editor, overlaps list, and real-time event handling.
Lane UI Enhancements apps/desktop/src/renderer/components/lanes/LaneList.tsx, apps/desktop/src/renderer/components/lanes/LaneRow.tsx, apps/desktop/src/renderer/components/lanes/LaneDetail.tsx, apps/desktop/src/renderer/components/lanes/LaneInspector.tsx, apps/desktop/src/renderer/components/lanes/LanesPage.tsx	Adds hierarchical stack graph visualization, conflict status badges, parent-child navigation, reparent/restack controls, and depth-based visual connectors.
Files & Graph Pages apps/desktop/src/renderer/components/files/FilesPage.tsx, apps/desktop/src/renderer/components/app/App.tsx, apps/desktop/src/renderer/components/app/TabNav.tsx, apps/desktop/src/renderer/components/app/AppShell.tsx	Adds graph page route with Network icon in navigation; replaces browser prompts with in-component text input modal in Files page; refines main layout wrapper.
UI Infrastructure & Styling apps/desktop/src/renderer/components/ui/Button.tsx, apps/desktop/src/renderer/index.css, apps/desktop/src/renderer/components/lanes/MonacoDiffView.tsx, apps/desktop/src/renderer/components/lanes/LaneTerminalsPanel.tsx	Wraps Button with forwardRef; adds 175+ lines of conflict/risk/animation CSS including shimmer, cell enter, risk pulse, conflict badge, and node animations.
Type Definitions & Utilities apps/desktop/src/shared/types.ts, apps/desktop/src/renderer/components/conflicts/extensionToLanguage.ts, apps/desktop/package.json, apps/desktop/scripts/ensure-electron.cjs	Extends LaneSummary with hierarchy fields; adds 250+ lines of conflict, graph, and policy types; ensures Electron binary availability; adds @xyflow/react dependency.

Sequence Diagram(s)

sequenceDiagram
    participant Client as Renderer Process
    participant IPC as IPC Bridge
    participant ConflictSvc as Conflict Service
    participant LaneSvc as Lane Service
    participant GitSvc as Git Service
    participant DB as Database

    Client->>IPC: runPrediction()
    IPC->>ConflictSvc: runPrediction({ laneId?, laneIds? })
    ConflictSvc->>LaneSvc: getAllLanes()
    LaneSvc->>DB: Query lanes
    DB-->>LaneSvc: Lane list
    LaneSvc-->>ConflictSvc: Lanes with details

    par Base Predictions
        ConflictSvc->>GitSvc: rev-parse(base), merge-tree(base→lane)
        GitSvc-->>ConflictSvc: Conflicts/overlaps
    and Pairwise Predictions
        ConflictSvc->>GitSvc: merge-tree(laneA→laneB)
        GitSvc-->>ConflictSvc: Conflicts/overlaps
    end

    ConflictSvc->>DB: upsertPrediction(predictions)
    ConflictSvc->>ConflictSvc: Compute risk matrix
    ConflictSvc->>ConflictSvc: Build batch assessment
    ConflictSvc-->>IPC: BatchAssessmentResult + chips
    IPC-->>Client: Render risk matrix + status

Loading

sequenceDiagram
    participant User as User
    participant UI as Lane UI
    participant IPC as IPC Bridge
    participant LaneSvc as Lane Service
    participant OpSvc as Operation Service
    participant GitSvc as Git Service
    participant JobEngine as Job Engine

    User->>UI: Select parent, click Restack
    UI->>IPC: restack({ laneId, recursive })
    IPC->>LaneSvc: restack(args)
    
    LaneSvc->>OpSvc: startOp({ type: 'restack' })
    OpSvc-->>LaneSvc: operationId + tracking
    
    LaneSvc->>GitSvc: rebase(laneA, parentHEAD)
    GitSvc-->>LaneSvc: New HEAD SHA
    
    LaneSvc->>JobEngine: onHeadChanged({ laneId, ... })
    JobEngine->>JobEngine: queueConflictPrediction(laneId)
    
    LaneSvc-->>IPC: RestackResult
    IPC-->>UI: Update lane state + trigger predict

Loading

Estimated code review effort

🎯 4 (Complex) | ⏱️ ~75 minutes

✨ Finishing touches

• 📝 Generate docstrings

🧪 Generate unit tests (beta)

• Create PR with unit tests
• Post copyable unit tests in a comment
• Commit unit tests in branch codex/ade-phase-4-5

Tip

Issue Planner is now in beta. Read the docs and try it out! Share your feedback on Discord.

---

_{Comment @coderabbitai help to get the list of available commands and usage tips.}