Add ⌘S hotkey to open a task's merge confirmation

2026-10-15 12:30:10 -07:00
parent a855933dee
commit 7ea14bd7a8
7 changed files with 73 additions and 31 deletions
@@ -80,21 +80,9 @@ function taskHead(rerender) {
                disabled: busy || held || unmerged?.taskId !== task.id || !unmerged.has,
                title: held
                    ? "Waiting for the merge in progress in this project to finish"
-                    : `The agent merges ${target} in, then byre squashes into one commit on ${target} and pushes it to origin; held while another task in the project is merging`,
+                    : `The agent merges ${target} in, then byre squashes into one commit on ${target} and pushes it to origin; held while another task in the project is merging (⌘S)`,
            }, held ? "Merge held" : "Merge");
-            merge.onclick = async () => {
-                let coAuthors;
-                try {
-                    coAuthors = await get("/api/tasks/{taskId}/co-authors", { path: { taskId: task.id } });
-                }
-                catch (err) {
-                    void showAlert(errorText(err));
-                    return;
-                }
-                await confirmThen(mergeQuestion(task.merge_title, target, coAuthors), "Merge", false, async () => {
-                    await post("/api/tasks/{taskId}/merge", { path: { taskId: task.id } });
-                });
-            };
+            merge.onclick = () => confirmMerge(task.id);
            const mergeIn = h("button", { disabled: busy, title: `Ask the agent to bring ${target} into this branch and resolve any conflicts` }, `Sync from ${target}`);
            mergeIn.onclick = async () => {
                mergeIn.disabled = true;
@@ -882,6 +870,32 @@ function messageImages(ids) {
        return h("a", { href: src, target: "_blank", rel: "noopener" }, h("img", { src, alt: "attached image", loading: "lazy" }));
    }));
 }
+export async function confirmMerge(taskId) {
+    const task = findTask(taskId);
+    const sessionState = currentSession(taskId)?.state;
+    if (!task || task.status !== "active" || task.merge_queued_at !== undefined || sessionState === "running" || sessionState === "queued") {
+        return;
+    }
+    const target = state.projects.find((p) => p.id === task.project_id)?.default_branch ?? "the default branch";
+    let coAuthors;
+    try {
+        const [unmerged, people] = await Promise.all([
+            get("/api/tasks/{taskId}/unmerged", { path: { taskId } }),
+            get("/api/tasks/{taskId}/co-authors", { path: { taskId } }),
+        ]);
+        if (unmerged.commits === 0 && unmerged.files === 0) {
+            return;
+        }
+        coAuthors = people;
+    }
+    catch (err) {
+        void showAlert(errorText(err));
+        return;
+    }
+    await confirmThen(mergeQuestion(task.merge_title, target, coAuthors), "Merge", false, async () => {
+        await post("/api/tasks/{taskId}/merge", { path: { taskId } });
+    });
+}
 function mergeQuestion(title, target, coAuthors) {
    const lines = [`Merge "${title}" into ${target}?`];
    const credited = coAuthors.filter((p) => p.git_name && p.git_email);