feat(ai-config): add role directives, auth retry, and clean up

- Introduce contractor, coder, reviewer, QA, proofreader & email directives
- Remove deprecated code-only and writing directives
- Update gptel-directives mapping and default prompts
- Add auth retry advice for cj/toggle-gptel
- Refactor indentation in toggle, keymap, and prompt functions

1 files changed, 114 insertions, 63 deletions

diff --git a/modules/ai-config.el b/modules/ai-config.el
index 59e3fc6a..f8bb23b2 100644
--- a/modules/ai-config.el
+++ b/modules/ai-config.el
@@ -16,53 +16,100 @@
 
 (defvar default-directive
   "You are a large language model living in Emacs. You understand philosophy, critical theory, and comparative
-  literature at a university graduate student level. You are concise and always provide references to source material.")
-
-(defvar code-only-directive
-  "You are a large language model living in Emacs. You are an expert in emacs-lisp, Python, Golang, and Shell scripting.
-  You encourage unit testing and always provide unit tests when you provide code.")
-
-(defvar writing-directive
-  "You are a large language model and a writing assistant. Respond concisely.")
+  literature at a university graduate student level. You have deep knowledge of the You are concise and always provide references to source material
+  you refer to. You are a good-natured conversation partner who asks thoughtful questions.")
+
+(defvar contractor-directive
+  "I want you to act as an assistant who has deep understanding of construction, remodeling, design, and architecture.
+  You are a master builder and residential/commercial trades mentor with deep current knowledge of electrical (NEC
+  concepts), plumbing (IPC/UPC concepts), tiling, carpentry, doors/windows, roofing, drywall/finishes,
+  appliances,structural framing, foundations, and HVAC. Audience: an intelligent DIYer or junior tradesperson. Goal:
+  explain clearly, prevent mistakes, and deliver safe, code-aware guidance. Do the math when relevant (loads, spans,
+  BTU/CFM sizing, voltage drop, slope/fall, coverage, tile layout math). Anticipate common mistakes and add a “Before
+  you start / Don’t do this” mini-list. Reference standards precisely but briefly (e.g., “NEC 210.8 GFCI in bathrooms”
+  or “typical 1/4 in. per foot drain slope”), without pretending to be the authority for their jurisdiction. Provide
+  visuals when helpful using simple ASCII diagrams or bullet schematics; label dimensions/clearances. Be plain-spoken,
+  specific, and unambiguous. Prefer exact dimensions, clearances, fastener types, and material specs. Use brand-agnostic
+  names first; add example products only if it clarifies. If info is missing, state reasonable assumptions and proceed
+  (note them). Never guess about safety-critical items; instead, flag clearly when a licensed
+  electrician/plumber/engineer is required (e.g., service panel work, structural alterations). Avoid fluff. No
+  motivational talk; just practical guidance.")
+
+(defvar coder-directive
+  "You are an expert in emacs-lisp, Python, Golang, and Shell scripting. I want you to act as a knowledgeable software
+  development mentor, specifically teaching a junior developer. Explain complex coding concepts in a simple and clear
+  way, breaking things down step by step with practical examples. Use analogies and practical advice to ensure
+  understanding. Anticipate common mistakes and provide tips to avoid them. Provide precise answers, avoiding ambiguous
+  responses. You encourage unit testing and always provide unit tests when you provide code.")
+
+(defvar reviewer-directive
+  "I want you to act as a code reviewer who is experienced developer in the given code language. I will provide you with
+  the code block or methods or code file along with the code language name, and I would like you to review the code and
+  share the feedback, suggestions and alternative recommended approaches. Please write explanations behind the feedback
+  or suggestions or alternative approaches.")
+
+(defvar qa-directive
+  "Act as an expert software engineer in test with strong experience in the given code language who is working with a
+  junior developer on their code. Your job is to write tests for the functionality and performance of the code provided.
+  I will pass you code and you have to analyze it and reply to me with the test cases and the tests code. You will also
+  identify any issues or bugs you encounter, write tests that would uncover the bug if possible, and provide
+  recommendations for improvement.")
+
+(defvar proofreader-directive
+  "I want you act as a proofreader. I will provide you some text and I would like you to review it for any spelling,
+  grammar, or punctuation errors. Once you have finished reviewing the text, provide me with any necessary corrections
+  or suggestions for improving the text.")
+
+(defvar email-directive
+  "I want you to act as an email writing assistant. I will provide you some direction on what the
+email should consist of, the tone of the email, and my guess as to the DISC profile of the email recipient. You will use
+the DISC profile information to guide the tone and wording of the email. However, always lean towards simple,
+straightforward, and clear language with little ambiguity. Ask questions to make any part of the email clearer if needed.")
 
 (defvar chat-directive
-  "You are a large language model and a funny conversation partner who asks good questions.")
+  "I want you to act as an old friend and highly intelligent person who is good at conversation. You are deeply
+  knowledgeable about academic philosophy and can discuss philosophical topics at the PhD level. When you do, you often
+  indicate the book or article relevant to the topic you discuss. You are very well
+  educated in history. You have a kind personality. You are a good person and value equality, courage,fortitude, and
+  compassion. You ask very good questions. You encourage people to improve themselves and you believe in them.")
 
 ;;; ------------------------------ Toggle GPTel --------------------------------
 
-
 (defun cj/toggle-gptel ()
   "Toggle the visibility of the ChatGPT buffer, and when shown place point at its end."
   (interactive)
   (let* ((buf-name "*AI-Assistant*")
-		 (buffer   (get-buffer buf-name))
-		 (win      (and buffer (get-buffer-window buffer))))
-	(if win
-		;; If it's already visible, just close it
-		(delete-window win)
-	  ;; Otherwise ensure the buffer exists
-	  (unless buffer
-		(gptel buf-name gptel-model))
-	  (setq buffer (get-buffer buf-name))
-	  ;; Display in a side window, select it, and move point to end
-	  (setq win
-			(display-buffer-in-side-window
-			 buffer
-			 '((side . right)
-			   (window-width . 0.4))))
-	  (select-window win)
-	  (with-current-buffer buffer
-		(goto-char (point-max))))))
+         (buffer   (get-buffer buf-name))
+         (win      (and buffer (get-buffer-window buffer))))
+    (if win
+        ;; If it's already visible, just close it
+        (delete-window win)
+      ;; Otherwise ensure the buffer exists
+      (unless buffer
+        (gptel buf-name gptel-model))
+      (setq buffer (get-buffer buf-name))
+      ;; Display in a side window, select it, and move point to end
+      (setq win
+            (display-buffer-in-side-window
+             buffer
+             '((side . right)
+               (window-width . 0.4))))
+      (select-window win)
+      (with-current-buffer buffer
+        (goto-char (point-max))))))
+
+;; retry if authinfo.gpg authentication fails
+(advice-add 'cj/toggle-gptel :before #'cj/ensure-auth-before)
 
 ;; ------------------------- GPTel Config And AI-Keymap ------------------------
 
 (defvar ai-keymap
   (let ((map (make-sparse-keymap)))
-	(define-key map (kbd "t") #'cj/toggle-gptel)
-	(define-key map (kbd "c") #'cj/gptel-clear-buffer)
-	(define-key map (kbd "m") #'gptel-menu)
-	(define-key map (kbd "p") #'gptel-system-prompt)
-	map)
+    (define-key map (kbd "t") #'cj/toggle-gptel)
+    (define-key map (kbd "c") #'cj/gptel-clear-buffer)
+    (define-key map (kbd "m") #'gptel-menu)
+    (define-key map (kbd "p") #'gptel-system-prompt)
+    map)
   "Keymap for AI commands, bound to C-h g…")
 (global-set-key (kbd "C-h g") ai-keymap)
 
@@ -72,7 +119,7 @@
   :bind
   ("<f9>"  . cj/toggle-gptel)
   (:map gptel-mode-map
-		("C-<return>" . gptel-send))
+        ("C-<return>" . gptel-send))
   :custom
   (gptel-default-directive 'code-only)
   (gptel-default-mode 'org-mode)
@@ -85,52 +132,56 @@
   :config
   ;; Directives
   (setq gptel-directives
-		`((default   . ,default-directive)
-		  (code-only . ,code-only-directive)
-		  (writing   . ,writing-directive)
-		  (chat      . ,chat-directive)))
+        `((default     . ,default-directive)
+          (coder       . ,coder-directive)
+          (reviewer    . ,reviewer-directive)
+          (qa          . ,qa-directive)
+          (proofreader . ,proofreader-directive)
+		  (email       . ,email-directive)
+		  (contractor  . ,contractor-directive)
+          (chat        . ,chat-directive)))
 
   ;;  Dynamic user prefix for org-mode heading (string, refreshed just before send)
   (defun cj/gptel--fresh-org-prefix ()
-	(concat "*** cj " (format-time-string "[%Y-%m-%d %H:%M:%S]") "\n"))
+    (concat "*** cj " (format-time-string "[%Y-%m-%d %H:%M:%S]") "\n"))
 
   ;; Initialize as a string (GPTel expectation)
   (setf (alist-get 'org-mode gptel-prompt-prefix-alist)
-		(cj/gptel--fresh-org-prefix))
+        (cj/gptel--fresh-org-prefix))
 
   ;; Refresh immediately before each send for accurate timestamp
   (defun cj/gptel--refresh-org-prefix (&rest _)
-	(setf (alist-get 'org-mode gptel-prompt-prefix-alist)
-		  (cj/gptel--fresh-org-prefix)))
+    (setf (alist-get 'org-mode gptel-prompt-prefix-alist)
+          (cj/gptel--fresh-org-prefix)))
   (advice-add 'gptel-send :before #'cj/gptel--refresh-org-prefix)
 
   ;; AI header on each reply: (e.g. "*** ChatGPT: <model> [timestamp]")
   (defun cj/gptel-backend-and-model ()
-	"Return backend, model, and timestamp as a single string."
-	(let* ((backend (pcase (bound-and-true-p gptel-backend)
-					  ((and v (pred vectorp)) (aref v 1))  ;; display name if vector
-					  (_ "ChatGPT")))
-		   (model   (format "%s" (or (bound-and-true-p gptel-model) "")))
-		   (ts      (format-time-string "[%Y-%m-%d %H:%M:%S]")))
-	  (format "%s: %s %s" backend model ts)))
+    "Return backend, model, and timestamp as a single string."
+    (let* ((backend (pcase (bound-and-true-p gptel-backend)
+                      ((and v (pred vectorp)) (aref v 1))  ;; display name if vector
+                      (_ "ChatGPT")))
+           (model   (format "%s" (or (bound-and-true-p gptel-model) "")))
+           (ts      (format-time-string "[%Y-%m-%d %H:%M:%S]")))
+      (format "%s: %s %s" backend model ts)))
 
   (defun cj/gptel-insert-model-heading (response-begin-pos _response-end-pos)
-	"Insert an Org heading for the AI reply at RESPONSE-BEGIN-POS."
-	(save-excursion
-	  (goto-char response-begin-pos)
-	  (insert (format "*** %s\n" (cj/gptel-backend-and-model)))))
+    "Insert an Org heading for the AI reply at RESPONSE-BEGIN-POS."
+    (save-excursion
+      (goto-char response-begin-pos)
+      (insert (format "*** %s\n" (cj/gptel-backend-and-model)))))
 
   (defun cj/gptel-clear-buffer ()
-	"Erase the contents of the *AI-Assistant* buffer, re-insert the org heading, and message."
-	(interactive)
-	(let ((buf (get-buffer "*AI-Assistant*")))
-	  (if (not buf)
-		  (message "No AI buffer found")
-		(with-current-buffer buf
-		  (erase-buffer)
-		  ;; re-insert the user heading with fresh timestamp
-		  (insert (cj/gptel--fresh-org-prefix))
-		  (message "AI buffer cleared and heading reset")))))
+    "Erase the contents of the *AI-Assistant* buffer, re-insert the org heading, and message."
+    (interactive)
+    (let ((buf (get-buffer "*AI-Assistant*")))
+      (if (not buf)
+          (message "No AI buffer found")
+        (with-current-buffer buf
+          (erase-buffer)
+          ;; re-insert the user heading with fresh timestamp
+          (insert (cj/gptel--fresh-org-prefix))
+          (message "AI buffer cleared and heading reset")))))
 
   ;; Hook is called with (BEG END); add our per-reply heading
   (add-hook 'gptel-post-response-functions #'cj/gptel-insert-model-heading)