Merge pull request '✨ Toggle agent done / not done (undone)' (#6) from undone-toggle into main

Reviewed-on: https://git.greil.fr/mat/agent-fleet.nvim/pulls/6

Author: MateoGreil

README.md

@@ -116,7 +116,7 @@ fields to override. See [Configuration](#configuration).
 :AgentResume     " reopen a past agent of this directory (focus if live, else resume)
 :Agents          " list & switch agents of this directory (focus if live, else resume)
 :AgentsBoard     " open the live board buffer (sections, colors, per-row keymaps)
-:AgentDone       " mark an agent done (✓)
+:AgentDone       " toggle an agent done / not done (✓)
 :AgentArchive    " archive / unarchive an agent (hidden from :Agents by default)
 :AgentRename foo " rename the current agent (or pick one) to "foo"
 :AgentRename     " rename via a prompt (current agent, or pick one)
@@ -150,7 +150,7 @@ keys (`j`/`k`/`/`/`gg`); the per-row actions are:
 | Key | Action |
 | --- | ------ |
 | `<CR>` | switch to the agent under the cursor (focus its terminal if live, else resume it via its CLI) |
-| `d` | mark done (✓) |
+| `d` | toggle done (✓) |
 | `x` | archive / unarchive |
 | `r` | rename (prompt) |
 | `s` | stop — kill the live terminal without marking it done (still resumable) |

ROADMAP.md

@@ -17,7 +17,7 @@ ships and what's planned. For the user-facing docs, see [README.md](README.md).
 - **[x] List & switch** — `:Agents` lists the agents of the **current directory**
   (live ones in this nvim merged with this cwd's pi sessions on disk, deduped by
   session id) and switches to the chosen one — focus if live, else resume.
-  `:AgentDone` marks an agent done (✓); `:AgentArchive` toggles archive (hidden
+  `:AgentDone` toggles an agent done / not done (✓); `:AgentArchive` toggles archive (hidden
   by default). Soft archive only — never deletes a session file. `:AgentRename`
   renames an agent (the current agent's buffer, or a picked one). `:AgentDone` /
   `:AgentArchive` also act on the current agent's buffer, closing (killing) its

lua/agent-fleet/actions.lua

@@ -26,9 +26,13 @@ end
 
 function M.done(row)
   local roster = require("agent-fleet.roster")
+  local now = not row.done
   roster.ensure({ id = row.id, type = row.type or "pi", name = row.name, cwd = row.cwd })
-  roster.mark_done(row.id)
-  M.close_live(row)
+  roster.set_done(row.id, now)
+  if now then
+    M.close_live(row)
+  end
+  return now
 end
 
 function M.archive(row)

lua/agent-fleet/board.lua

@@ -298,14 +298,7 @@ function M.render(rows, opts)
 end
 
 function M.done_candidates(cwd)
-  local rows = M.rows({ cwd = cwd or vim.fn.getcwd() })
-  local result = {}
-  for _, row in ipairs(rows) do
-    if not row.done then
-      result[#result + 1] = row
-    end
-  end
-  return result
+  return M.rows({ cwd = cwd or vim.fn.getcwd() })
 end
 
 function M.archive_candidates(cwd)

lua/agent-fleet/roster.lua

@@ -102,12 +102,16 @@ function M.set_name(id, name)
   end)
 end
 
-function M.mark_done(id)
+function M.set_done(id, done)
   return update(id, function(entry)
-    entry.done = true
+    entry.done = done
   end)
 end
 
+function M.mark_done(id)
+  return M.set_done(id, true)
+end
+
 function M.set_archived(id, archived)
   return update(id, function(entry)
     entry.archived = archived

lua/agent-fleet/ui.lua

@@ -198,32 +198,44 @@ local function handle_enter()
   require("agent-fleet.agent").resume_session({ id = row.id, cwd = row.cwd, type = row.type })
 end
 
-local function mark_rows_done(rows)
+local function toggle_done_rows(rows)
   if #rows == 0 then
     return
   end
   local actions = require("agent-fleet.actions")
+  local done, undone = 0, 0
   for _, row in ipairs(rows) do
-    actions.done(row)
+    if actions.done(row) then
+      done = done + 1
+    else
+      undone = undone + 1
+    end
   end
   M.refresh()
   if #rows == 1 then
-    notify("marked done \u{2014} " .. rows[1].name)
-  else
-    notify("marked done \u{2014} " .. #rows .. " agents")
+    notify((done == 1 and "marked done" or "marked not done") .. " \u{2014} " .. rows[1].name)
+    return
   end
+  local parts = {}
+  if done > 0 then
+    parts[#parts + 1] = "done " .. done
+  end
+  if undone > 0 then
+    parts[#parts + 1] = "not done " .. undone
+  end
+  notify(table.concat(parts, ", "))
 end
 
 function M.done_range(line1, line2)
-  mark_rows_done(M.rows_in_range(line1, line2))
+  toggle_done_rows(M.rows_in_range(line1, line2))
 end
 
 local function handle_done()
   local row = M.row_under_cursor()
   if not row then
     return
   end
-  mark_rows_done({ row })
+  toggle_done_rows({ row })
 end
 
 local function visual_line_range()

plugin/agent-fleet.lua

@@ -74,8 +74,11 @@ vim.api.nvim_create_user_command("AgentDone", function()
   local actions = require("agent-fleet.actions")
   local row = actions.current_row()
   if row then
-    actions.done(row)
-    vim.notify("agent-fleet: marked done \u{2014} " .. row.name, vim.log.levels.INFO)
+    local now = actions.done(row)
+    vim.notify(
+      ("agent-fleet: %s \u{2014} %s"):format(now and "marked done" or "marked not done", row.name),
+      vim.log.levels.INFO
+    )
     return
   end
   local cands = require("agent-fleet.board").done_candidates(vim.fn.getcwd())
@@ -85,17 +88,20 @@ vim.api.nvim_create_user_command("AgentDone", function()
   end
   local now = os.time() * 1000
   vim.ui.select(cands, {
-    prompt = "Mark done",
+    prompt = "Mark done / not done",
     format_item = function(row)
       return require("agent-fleet.board").format_row(row, now)
     end,
   }, function(chosen)
     if chosen then
-      actions.done(chosen)
-      vim.notify("agent-fleet: marked done \u{2014} " .. chosen.name, vim.log.levels.INFO)
+      local now = actions.done(chosen)
+      vim.notify(
+        ("agent-fleet: %s \u{2014} %s"):format(now and "marked done" or "marked not done", chosen.name),
+        vim.log.levels.INFO
+      )
     end
   end)
-end, { desc = "agent-fleet: mark a past agent done (current directory)" })
+end, { desc = "agent-fleet: toggle an agent done / not done (current directory)" })
 
 vim.api.nvim_create_user_command("AgentArchive", function()
   local actions = require("agent-fleet.actions")

tests/actions_spec.lua

@@ -62,6 +62,15 @@ local id_done2 = "dddddddd-dddd-dddd-dddd-dddddddddd02"
 actions.done({ id = id_done2, name = "doner2", cwd = "/proj/d", live = false })
 check("done non-live marks done", roster.get(id_done2) ~= nil and roster.get(id_done2).done == true)
 
+-- done: un-doing a live row -> returns false, not done, buffer kept
+local id_undone = "dddddddd-dddd-dddd-dddd-dddddddddd03"
+local buf_undone = make_term()
+local res_undone =
+  actions.done({ id = id_undone, name = "undoner", cwd = "/proj/d", live = true, bufnr = buf_undone, done = true })
+check("done returns false when un-doing", res_undone == false)
+check("undone clears done", roster.get(id_undone) ~= nil and roster.get(id_undone).done == false)
+check("undone keeps buffer", vim.api.nvim_buf_is_valid(buf_undone) == true)
+
 -- archive: live unarchived row -> returns true, archived, buffer wiped
 local id_arch = "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaa01"
 local buf_arch = make_term()

tests/lifecycle_spec.lua

@@ -47,8 +47,9 @@ local function write_session(cwd, id, ts)
   return file
 end
 
--- Case 1: done_candidates includes a live agent and a disk-only (non-roster)
--- session; excludes a done one and an archived one.
+-- Case 1: done_candidates includes a live agent, a disk-only (non-roster)
+-- session, and an already-done one (so it can be un-done); excludes an
+-- archived one.
 local C1 = "/proj/c1"
 local id_plain = "11111111-1111-1111-1111-111111111111"
 local id_done = "11111111-1111-1111-1111-111111111112"
@@ -69,7 +70,7 @@ local dc = board.done_candidates(C1)
 check("case1 plain present", has_id(dc, id_plain))
 check("case1 live included", has_id(dc, id_live))
 check("case1 disk-only included", has_id(dc, id_disk))
-check("case1 done excluded", not has_id(dc, id_done))
+check("case1 done included", has_id(dc, id_done))
 check("case1 archived excluded", not has_id(dc, id_arch))
 check("case1 row shape", find_id(dc, id_live).live == true)
 
@@ -107,7 +108,9 @@ roster.ensure({ id = row3.id, type = "pi", name = row3.name, cwd = row3.cwd })
 roster.mark_done(row3.id)
 check("case3 entry materialized", roster.get(id3) ~= nil)
 check("case3 marked done", roster.get(id3).done == true)
-check("case3 drops out of done_candidates", not has_id(board.done_candidates(C3), id3))
+check("case3 stays in done_candidates so it can be un-done", has_id(board.done_candidates(C3), id3))
+roster.set_done(row3.id, false)
+check("case3 toggling again via set_done reverts done to false", roster.get(id3).done == false)
 
 -- Case 4: materialize-then-flag archive toggling a previously-untracked row.
 local C4 = "/proj/c4"

tests/roster_spec.lua

@@ -36,6 +36,9 @@ check(
 
 r.mark_done("aaa")
 check("mark_done", r.get("aaa").done == true)
+r.set_done("aaa", true)
+r.set_done("aaa", false)
+check("set_done toggles off", r.get("aaa").done == false)
 r.set_name("aaa", "x")
 check("set_name", r.get("aaa").name == "x")