From 082037ad75e21405655adb492d0c85e342f4f771 Mon Sep 17 00:00:00 2001
From: Craig Jennings <c@cjennings.net>
Date: Fri, 22 May 2026 15:01:14 -0500
Subject: feat(org-config): add cj/org-finalize-task with tests

I added a command on C-; O d that finalizes the task at point. It prompts for a finalized keyword from org-done-keywords, so the picker tracks org-todo-keywords automatically. Marking the task done fires the org-roam journal-copy hook, so the completed task lands in today's daily.

Then the heading is reshaped by depth. A sub-task (level 3 or deeper, or a VERIFY at any depth) becomes a dated log entry: the keyword and priority cookie are stripped, a sortable timestamp is prepended, and the tags are kept. A top-level task keeps its keyword and gains a date-only CLOSED line.

The command binds org-inhibit-logging around the org-todo call so it owns the CLOSED line rather than depending on org-log-done, which is set inconsistently across two modules. The journal hook keys off org-state, not org-log-done, so the copy still fires.

Tests run in org temp-buffers with the journal hook bound to nil, exercise the real org primitives, and inject a fixed time so the stamp shape is deterministic.
---
 modules/org-config.el | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 70 insertions(+)

(limited to 'modules')

diff --git a/modules/org-config.el b/modules/org-config.el
index c04683c0..31ed7f6c 100644
--- a/modules/org-config.el
+++ b/modules/org-config.el
@@ -348,6 +348,76 @@ status to preserve priority ordering within TODO groups."
       (user-error nil)))
   (message "Sorted entries by TODO status and priority"))
 
+;; --------------------- Finalize Task (done + journal + log) ------------------
+;; `cj/org-finalize-task' (C-; O d) marks the task at point done with a chosen
+;; finalized keyword -- which fires the org-roam journal-copy hook -- then
+;; reshapes the heading per todo-format: a dated log entry for sub-tasks (and
+;; VERIFY at any depth), or a kept keyword plus a date-only CLOSED line for
+;; top-level tasks.
+
+(defun cj/--org-finalize-dated-p (level keyword)
+  "Return non-nil when a finalized heading should become a dated log entry.
+Per todo-format: sub-tasks at LEVEL 3 or deeper flip to a dated entry, and a
+VERIFY (by KEYWORD) flips at any depth.  Top-level tasks stay task-shaped."
+  (or (>= level 3)
+      (equal keyword "VERIFY")))
+
+(defun cj/--org-finalize-rewrite-dated (&optional time)
+  "Rewrite the heading at point as a dated log entry.
+Strip the todo keyword and [#X] priority cookie, prepend a sortable timestamp
+built from TIME (default now), and keep the tags."
+  (org-back-to-heading t)
+  (let ((stamp (format-time-string "%Y-%m-%d %a @ %H:%M:%S %z" time))
+        (org-inhibit-logging t))
+    (when (org-get-todo-state) (org-todo 'none))
+    (when (nth 3 (org-heading-components))   ; only if a [#X] cookie is present
+      (org-priority 'remove))
+    (org-edit-headline (concat stamp " " (org-get-heading t t t t)))))
+
+(defun cj/--org-finalize-close-in-place (&optional time)
+  "Add a date-only CLOSED line under the heading at point, keeping the keyword.
+TIME defaults to now.  Used for top-level tasks that stay task-shaped."
+  (org-back-to-heading t)
+  (let ((org-inhibit-logging t))
+    (org-add-planning-info 'closed (or time (current-time))))
+  ;; org's CLOSED stamp may carry HH:MM; normalize to date-only per todo-format.
+  (save-excursion
+    (org-back-to-heading t)
+    (let ((end (save-excursion (outline-next-heading) (point)))
+          (stamp (format-time-string "[%Y-%m-%d %a]" time)))
+      (when (re-search-forward "CLOSED: \\[[^]]*\\]" end t)
+        (replace-match (concat "CLOSED: " stamp) t t)))))
+
+(defun cj/org-finalize-task (&optional state time)
+  "Finalize the task at point: mark it done and reshape it per todo-format.
+Prompt for a finalized keyword from `org-done-keywords' (STATE skips the
+prompt, TIME sets the timestamp -- both for testing).  Marking the task done
+fires the journal-copy hook, then a sub-task (level >= 3, or a VERIFY at any
+depth) becomes a dated log entry while a top-level task keeps its keyword and
+gains a date-only CLOSED line."
+  (interactive)
+  (unless (derived-mode-p 'org-mode)
+    (user-error "Only available in Org buffers"))
+  (org-back-to-heading t)
+  (let ((keyword (org-get-todo-state))
+        (level (org-current-level)))
+    (unless (member keyword org-not-done-keywords)
+      (user-error "Not on an open task (no actionable TODO keyword)"))
+    (let ((finalized
+           (or state
+               (let ((default (if (member "DONE" org-done-keywords)
+                                  "DONE"
+                                (car org-done-keywords))))
+                 (completing-read "Finalize as: " org-done-keywords
+                                  nil t nil nil default)))))
+      (let ((org-inhibit-logging t))
+        (org-todo finalized))           ; fires the journal-copy hook
+      (if (cj/--org-finalize-dated-p level keyword)
+          (cj/--org-finalize-rewrite-dated time)
+        (cj/--org-finalize-close-in-place time)))))
+
+(keymap-set cj/org-map "d" #'cj/org-finalize-task)
+
 ;; ------------------------------ Org Keybindings ------------------------------
 
 ;; which-key labels for org keymaps
-- 
cgit v1.2.3