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

merge: 合并失败补救完成后自动收口原任务 [tsk_BagzbKZNAHXV]

Browse Source 
手工解决 src/api/server.ts 冲突(keep-both):main 的 cleanupTaskRunArtifacts(合并后回收 run 目录)与分支的 findMergeOriginTask/remediateOrigin(补救任务合并成功后自动把原任务标 done)互补,均保留;ensureMergeRemediationTask 调用补 conflictFiles。其余文件(store.ts/types.ts/merge.ts/web/test)自动合并。typecheck + 183 测试全绿。

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
wangjia
2026-06-13 20:10:00 +08:00
parent 3d73b0cd85 b1d881a4b4
commit d1e256b960
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
@@ -943,6 +943,14 @@ svg.icon {
.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; }