Add local file conflict metadata

docs/roadmap.md

@@ -361,11 +361,16 @@ and future group key evolution.
     recorded future sync decision.
   - `[ ]` File roots can be synced across nodes.
 
-- `[ ]` Conflict handling.
+- `[~]` Conflict handling.
   Acceptance criteria:
-  - Conflicts are represented as durable metadata.
-  - CLI can list conflicts and choose a resolution.
-  - Tests cover concurrent edit, delete/edit, and rename conflicts.
+  - `[x]` Conflicts are represented as durable metadata.
+  - `[x]` CLI/control can record, list, and choose a resolution for local
+    conflict metadata.
+  - `[x]` Tests cover local concurrent edit conflict record/list/resolve.
+  - `[ ]` Future sync records conflicts automatically from base/local/remote
+    tree comparisons.
+  - `[ ]` Tests cover automatic concurrent edit, delete/edit, and rename
+    conflict detection.
 
 - `[ ]` Keyhive-like convergent capabilities.
   Acceptance criteria: