新增: 仲裁合并(冲突检测+ConflictResolver+reviewer仲裁基础)

- Coordinator.merge: 跳过失败SubTask+同文件冲突检测+extract_written_files - ConflictResolver.vue: 双栏diff展示+接受A/接受B/合并/手动按钮 - i18n: 冲突相关翻译键(中英文) - 7个merge测试全绿(含4个新增冲突检测)
2026-07-01 22:32:27 +08:00
parent 9947e6c1fe
commit 1d580dccc3
5 changed files with 298 additions and 5 deletions
@@ -3,6 +3,11 @@ export default {
    // ── Multi-Agent parallel execution ──
    planProgress: 'Execution Plan',
    planLayer: 'Layer {n}',
+    conflictsPending: '{n} conflicts to resolve',
+    acceptA: 'Accept A',
+    acceptB: 'Accept B',
+    mergeBoth: 'Merge Both',
+    manualResolve: 'Manual',

    // ── Conversation sidebar ──
    sidebarTitle: 'Chats',