feat: visually group subtasks in sidebar

Author: stevearc

lua/overseer/component/dependencies.lua

@@ -39,6 +39,7 @@ return {
               end
               new_task.cwd = new_task.cwd or task.cwd
               new_task.env = new_task.env or task.env
+              new_task.parent_id = task.parent_id or task.id
               self.task_lookup[i] = new_task.id
               new_task:add_component({ "on_success_complete_dependency", task_id = task.id })
               -- Don't include child tasks when saving to bundle.

lua/overseer/strategy/orchestrator.lua

@@ -231,6 +231,7 @@ function OrchestratorStrategy:start(task)
                 task_defn.env = vim.tbl_deep_extend("force", task_defn.env or {}, params.env or {})
               end
               local new_task = Task.new(task_defn)
+              new_task.parent_id = task.id
               new_task:add_component("orchestrator.on_status_broadcast")
               -- Don't include child tasks when saving to bundle. We will re-create them when the
               -- orchestration task is loaded.

lua/overseer/task.lua

@@ -18,13 +18,14 @@ local STATUS = constants.STATUS
 ---@field cmd string|string[]
 ---@field cwd string
 ---@field env? table<string, string>
----@field strategy_defn nil|string|table
+---@field strategy_defn? string|table
 ---@field strategy? overseer.Strategy
 ---@field name string
----@field bufnr number|nil
----@field exit_code number|nil
+---@field private bufnr? number
+---@field exit_code? number
 ---@field components overseer.Component[]
----@field _subscribers table<string, function[]>
+---@field parent_id? integer ID of parent task. Used only to visually group tasks in the task list
+---@field private _subscribers table<string, function[]>
 local Task = {}
 
 local next_id = 1
@@ -40,7 +41,7 @@ Task.params = {
   },
 }
 
----@class overseer.TaskDefinition
+---@class (exact) overseer.TaskDefinition
 ---@field cmd string|string[]
 ---@field args? string[]
 ---@field name? string

lua/overseer/task_list/init.lua

@@ -22,6 +22,21 @@ end
 
 M.rerender = rerender
 
+local function group_parents_and_children()
+  local order = {}
+  for i, task in ipairs(tasks) do
+    order[task.id] = i
+  end
+  for _, task in ipairs(tasks) do
+    if task.parent_id then
+      order[task.id] = order[task.parent_id] - 0.5
+    end
+  end
+  table.sort(tasks, function(a, b)
+    return order[a.id] < order[b.id]
+  end)
+end
+
 M.update = function(task)
   if not task then
     rerender()
@@ -33,6 +48,7 @@ M.update = function(task)
   if not lookup[task.id] then
     lookup[task.id] = task
     table.insert(tasks, task)
+    group_parents_and_children()
   end
   rerender()
 end
@@ -46,6 +62,7 @@ M.touch_task = function(task)
   end)
   table.remove(tasks, idx)
   table.insert(tasks, task)
+  group_parents_and_children()
   rerender()
 end
 

lua/overseer/task_list/sidebar.lua

@@ -300,14 +300,39 @@ function Sidebar:render(tasks)
   local lines = {}
   local highlights = {}
   self.task_lines = {}
+  local subtask_prefix = "▐ "
   -- Iterate backwards so we show most recent tasks first
   for i = #tasks, 1, -1 do
     local task = tasks[i]
     local detail = self.task_detail[task.id] or self.default_detail
+    local start_idx = #lines + 1
+    local hl_start_idx = #highlights + 1
     task:render(lines, highlights, detail)
+
+    -- Indent subtasks
+    if task.parent_id then
+      for j = start_idx, #lines do
+        lines[j] = subtask_prefix .. lines[j]
+      end
+      for j = hl_start_idx, #highlights do
+        local hl = highlights[j]
+        hl[3] = hl[3] + subtask_prefix:len()
+        if hl[4] ~= -1 then
+          hl[4] = hl[4] + subtask_prefix:len()
+        end
+        highlights[j] = hl
+      end
+      for j = start_idx, #lines do
+        table.insert(highlights, { "OverseerTaskBorder", j, 0, subtask_prefix:len() })
+      end
+    end
     table.insert(self.task_lines, { #lines, task })
     if i > 1 then
-      table.insert(lines, config.task_list.separator)
+      if tasks[i - 1].parent_id then
+        table.insert(lines, subtask_prefix .. vim.fn.strcharpart(config.task_list.separator, 2))
+      else
+        table.insert(lines, config.task_list.separator)
+      end
       table.insert(highlights, { "OverseerTaskBorder", #lines, 0, -1 })
     end
   end