From aa1008dcff316a79811b73feeef0c0cf1264310a Mon Sep 17 00:00:00 2001
From: mika kuns <mika.kuns@fb-tuning.de>
Date: Fri, 17 Apr 2026 14:30:35 +0200
Subject: [PATCH] fix(ui): capture CurrentListId before await in AddTask

---
 src/ClaudeDo.Ui/ViewModels/TaskListViewModel.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/ClaudeDo.Ui/ViewModels/TaskListViewModel.cs b/src/ClaudeDo.Ui/ViewModels/TaskListViewModel.cs
index bb14108..0ea3727 100644
--- a/src/ClaudeDo.Ui/ViewModels/TaskListViewModel.cs
+++ b/src/ClaudeDo.Ui/ViewModels/TaskListViewModel.cs
@@ -157,17 +157,20 @@ public partial class TaskListViewModel : ViewModelBase
     [RelayCommand(CanExecute = nameof(CanAddTask))]
     private async Task AddTask()
     {
+        var listId = CurrentListId;
+        if (listId is null) return;
+
         string defaultCommitType;
         using (var context = _dbFactory.CreateDbContext())
         {
             var listRepo = new ListRepository(context);
-            var list = await listRepo.GetByIdAsync(CurrentListId);
+            var list = await listRepo.GetByIdAsync(listId);
             defaultCommitType = list?.DefaultCommitType ?? "chore";
         }
 
         var editor = _editorFactory();
         await editor.LoadAgentsAsync(_worker);
-        editor.InitForCreate(CurrentListId, defaultCommitType);
+        editor.InitForCreate(listId, defaultCommitType);
 
         var window = new TaskEditorView { DataContext = editor };
         editor.RequestClose += () => window.Close();