diff --git a/src/ClaudeDo.Worker/Runner/TaskRunner.cs b/src/ClaudeDo.Worker/Runner/TaskRunner.cs
index 53fda84..f18bb03 100644
--- a/src/ClaudeDo.Worker/Runner/TaskRunner.cs
+++ b/src/ClaudeDo.Worker/Runner/TaskRunner.cs
@@ -1,5 +1,6 @@
 using System.Text.Json;
 using ClaudeDo.Data;
+using Serilog.Context;
 using ClaudeDo.Data.Models;
 using ClaudeDo.Data.Repositories;
 using ClaudeDo.Worker.Config;
@@ -46,6 +47,7 @@ public sealed class TaskRunner
 
     public async Task RunAsync(TaskEntity task, string slot, CancellationToken ct)
     {
+        using var _taskScope = LogContext.PushProperty("TaskId", task.Id);
         string? mcpToken = null;
         string? mcpConfigPath = null;
         try
@@ -170,6 +172,7 @@ public sealed class TaskRunner
 
     public async Task ContinueAsync(string taskId, string followUpPrompt, string slot, CancellationToken ct)
     {
+        using var _taskScope = LogContext.PushProperty("TaskId", taskId);
         TaskEntity task;
         TaskRunEntity lastRun;
         ListEntity list;