Let the agent stop a merge for review after substantive conflict fixes

2026-10-15 19:36:42 -07:00
parent a2067c2ba0
commit 55b6a32263
7 changed files with 59 additions and 8 deletions
@@ -911,6 +911,8 @@ function renderEvent(ev, ctx) {
        }
        case "task.merge_queued":
            return h("div", { class: "note" }, `${ev.actor} asked to merge; held until the merge in progress in this project is done `, when);
+        case "task.merge_stopped":
+            return h("div", { class: "note" }, `${ev.actor} stopped the merge for review: ${String(p["reason"])} `, when);
        case "preview.exposed": {
            const url = previewURL(Number(p["port"]));
            return h("div", { class: "note" }, `${ev.actor} exposed "${String(p["name"])}" at `, h("a", { href: url, target: "_blank", rel: "noopener" }, url), " ", when);