From ada4d9fd9b8c2a502e495310b964ce0185b14cfa Mon Sep 17 00:00:00 2001
From: mika kuns <mika.kuns@fb-tuning.de>
Date: Fri, 24 Apr 2026 15:51:40 +0200
Subject: [PATCH] fix(worker): wrap MergeAbortAsync in AbortMergeAsync for
 consistent error handling

---
 src/ClaudeDo.Worker/Services/TaskMergeService.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/ClaudeDo.Worker/Services/TaskMergeService.cs b/src/ClaudeDo.Worker/Services/TaskMergeService.cs
index e8700e3..bc2b1bb 100644
--- a/src/ClaudeDo.Worker/Services/TaskMergeService.cs
+++ b/src/ClaudeDo.Worker/Services/TaskMergeService.cs
@@ -216,7 +216,8 @@ public sealed class TaskMergeService
         if (!await _git.IsMidMergeAsync(list.WorkingDir, ct))
             return Blocked("repo is not mid-merge");
 
-        await _git.MergeAbortAsync(list.WorkingDir, ct);
+        try { await _git.MergeAbortAsync(list.WorkingDir, ct); }
+        catch (Exception ex) { return Blocked($"abort failed: {ex.Message}"); }
         _logger.LogInformation("Aborted merge of task {TaskId}", taskId);
 
         return new MergeResult(StatusAborted, Array.Empty<string>(), null);