diff --git a/core/agents/developer.py b/core/agents/developer.py
index 7878d963..3e1ff861 100644
--- a/core/agents/developer.py
+++ b/core/agents/developer.py
@@ -72,13 +72,6 @@ class TaskSteps(BaseModel):
     steps: list[Step]
 
 
-DEV_WAIT_TEST = "Awaiting user test"
-DEV_TASK_STARTING = "Starting task #{}"
-DEV_TASK_BREAKDOWN = "Task #{} breakdown"
-DEV_TROUBLESHOOT = "Troubleshooting #{}"
-DEV_TASK_REVIEW_FEEDBACK = "Task review feedback"
-
-
 class Developer(ChatWithBreakdownMixin, RelevantFilesMixin, BaseAgent):
     agent_type = "developer"
     display_name = "Developer"
@@ -214,6 +207,8 @@ class Developer(ChatWithBreakdownMixin, RelevantFilesMixin, BaseAgent):
         # Check which files are relevant to the current task
         await self.get_relevant_files_parallel()
 
+        current_task_index = self.current_state.tasks.index(current_task)
+
         await self.send_message("Thinking about how to implement this task ...")
 
         await self.ui.start_breakdown_stream()
@@ -255,6 +250,7 @@ class Developer(ChatWithBreakdownMixin, RelevantFilesMixin, BaseAgent):
         # There might be state leftovers from previous tasks that we need to clean here
         self.next_state.modified_files = {}
         self.set_next_steps(response, source)
+        self.next_state.action = f"Task #{current_task_index + 1} start"
         await telemetry.trace_code_event(
             "task-start",
             {