From f1cf29b58dbbd2fd668bbd07532bda087e32c73b Mon Sep 17 00:00:00 2001
From: mika kuns <mika.kuns@fb-tuning.de>
Date: Thu, 4 Jun 2026 23:27:59 +0200
Subject: [PATCH] fix(worker): guard blank working dir in approve-merge before
 resolving target

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
---
 src/ClaudeDo.Worker/Lifecycle/TaskMergeService.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/ClaudeDo.Worker/Lifecycle/TaskMergeService.cs b/src/ClaudeDo.Worker/Lifecycle/TaskMergeService.cs
index e8e578a..095bcf4 100644
--- a/src/ClaudeDo.Worker/Lifecycle/TaskMergeService.cs
+++ b/src/ClaudeDo.Worker/Lifecycle/TaskMergeService.cs
@@ -267,6 +267,9 @@ public sealed class TaskMergeService
                 : Blocked(done.Reason ?? "approve failed");
         }
 
+        if (string.IsNullOrWhiteSpace(list.WorkingDir))
+            return Blocked("list has no working directory");
+
         var target = string.IsNullOrWhiteSpace(targetBranch)
             ? await _git.GetCurrentBranchAsync(list.WorkingDir, ct)
             : targetBranch;