40 lines
1.4 KiB
Markdown
40 lines
1.4 KiB
Markdown
|
# Sprint 144 Plan: Bidirectional Conflict Resolution and Merge Policies
|
||
|
|
|
||
|
|
## Context
|
||
|
|
|
||
|
|
In hybrid workflows, text and AST may diverge. Sprint 144 introduces explicit,
|
||
|
|
deterministic conflict policies with reproducible merge outcomes.
|
||
|
|
|
||
|
|
---
|
||
|
|
|
||
|
|
## Goals
|
||
|
|
|
||
|
|
1. Detect text-vs-AST divergence with structured conflict packets
|
||
|
|
2. Support deterministic merge policies (`text_wins`, `ast_wins`, `three_way`)
|
||
|
|
3. Provide conflict previews before destructive reconciliation
|
||
|
|
4. Persist reconciliation outcomes for replay/audit
|
||
|
|
|
||
|
|
---
|
||
|
|
|
||
|
|
## Steps
|
||
|
|
|
||
|
|
### Step 1679: Text-AST divergence packet schema (10 tests)
|
||
|
|
### Step 1680: Conflict region detector model (10 tests)
|
||
|
|
### Step 1681: Merge policy engine model (`text_wins`, `ast_wins`, `three_way`) (10 tests)
|
||
|
|
### Step 1682: Conflict preview and impact estimator model (10 tests)
|
||
|
|
### Step 1683: `whetstone_detect_text_ast_conflicts` MCP tool (8 tests)
|
||
|
|
### Step 1684: `whetstone_preview_text_ast_merge` MCP tool (8 tests)
|
||
|
|
### Step 1685: `whetstone_apply_text_ast_merge` MCP tool (8 tests)
|
||
|
|
### Step 1686: Reconciliation decision packet model (8 tests)
|
||
|
|
### Step 1687: Conflict/merge report artifact (8 tests)
|
||
|
|
### Step 1688: Sprint 144 integration summary + regression (8 tests)
|
||
|
|
|
||
|
|
---
|
||
|
|
|
||
|
|
## Architecture Gate
|
||
|
|
|
||
|
|
- Conflict detection and merge must be deterministic
|
||
|
|
- Merge policies must emit explicit provenance per decision
|
||
|
|
- Reconciliation outputs must be replayable
|
||
|
|
- Max 600 lines per header
|