wangjia/maestro
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 合并失败→补救→完成 全程事件轨迹与自动收口 [tsk_BagzbKZNAHXV]

Browse Source 
不新增顶层状态，用 events + result 字段记录完整轨迹：
- 新增 merge.failed / merge.remediated 两类事件
- merge 失败时在原任务时间线记 merge.failed 节点（结构化冲突文件 + 补救任务链接）
- 补救任务成功合并后，findMergeOriginTask 反查原任务，remediateOrigin 自动把原任务标 done
  并记 merge.remediated 节点，无需人工 merge:false
- 看板：归档时间线渲染失败/补救节点；结果评审闸显示「合并失败 → 补救任务」横幅

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
wangjia
2026-06-13 15:04:39 +08:00
parent f020e15137
commit b1d881a4b4
7 changed files with 149 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web/style.css
+8
View File
@@ -912,6 +912,14 @@ li.ev-updated { --ev: var(--muted); }
.tl-who { color: var(--muted); font-size: 11px; }
.archive-row { cursor: pointer; }
/* 合并失败横幅（结果评审闸） */
.merge-failed-banner {
border-left: 3px solid var(--red, #d9534f);
background: rgba(217, 83, 79, 0.08);
padding: 8px 12px; border-radius: 4px;
font-size: 12px; line-height: 1.6;
}
/* 顶栏动作不换行（同步 todo / 配置 按钮文字曾被挤成两行） */
.top-actions { flex-wrap: nowrap; }
.top-actions .btn, .sync-meta { white-space: nowrap; }