Merge branch 'main' of github.com:tninja/ai-code-interface.el

Author: Kang Tu

README.org

@@ -48,7 +48,7 @@ An Emacs interface for AI-assisted software development. *The purpose is to prov
 - `org`: Org-mode support
 - `magit`: Git integration
 - `transient`: For the menu system
-- Claude Code (`[[https://github.com/stevemolitor/claude-code.el][claude-code.el]]`)
+- Claude Code (`[[https://github.com/stevemolitor/claude-code.el][claude-code.el]]`), (use straight to install, NOT MELPA version)
   - eat / vterm need to be installed to support various AI coding CLI backends.
 
 *** Optional Dependencies

ai-code-backends.el

@@ -168,9 +168,13 @@ Sets `ai-code-cli-*' defaliases and updates `ai-code-cli'."
       (when (and feature (not (featurep feature)))
         (user-error "Backend '%s' is not available. Please install the package providing '%s' and try again."
                     label (symbol-name feature)))
-      (unless (and (fboundp start) (fboundp switch) (fboundp send))
-        (user-error "Backend '%s' is not available (missing functions). Please install the package providing '%s'."
-                    label (symbol-name feature)))
+      (let ((missing-fns (seq-filter (lambda (fn) (not (fboundp fn)))
+                                      (list start switch send))))
+        (when missing-fns
+          (user-error "Backend '%s' is not available (missing functions: %s). Please install the package providing '%s'."
+                      label
+                      (mapconcat #'symbol-name missing-fns ", ")
+                      (symbol-name feature))))
       (defalias 'ai-code-cli-start start)
       (defalias 'ai-code-cli-switch-to-buffer switch)
       (defalias 'ai-code-cli-send-command send)

ai-code-change.el

@@ -320,13 +320,13 @@ ARG is the prefix argument for clipboard context."
            (region-text
             (unless (ai-code--is-comment-block region-text)
               (user-error "Selected region must be a comment block"))
-           (format (concat
-                     "Please implement code for this requirement comment block in the selected region. "
-                     "Keep the comment in place and ensure it begins with a DONE prefix (change TODO to DONE or prepend DONE if no prefix). "
+            (format (concat
+                     "Please implement code for this requirement comment block in the selected region first. "
+                     "After implementing, keep the comment in place and ensure it begins with a DONE prefix (change TODO to DONE or prepend DONE if no prefix). "
                      "If this is a pure new code block, place it after the comment; otherwise keep the existing structure and make corresponding change for the context.\n%s\n%s%s%s")
                     region-location-line region-text function-context files-context-string))
            (is-comment
-            (format "Please implement code for this requirement comment on line %d: '%s'. Keep the comment in place and ensure it begins with a DONE prefix (change TODO to DONE or prepend DONE if needed). If this is a pure new code block, place it after the comment; otherwise keep the existing structure and make corresponding change for the context.%s%s"
+            (format "Please implement code for this requirement comment on line %d: '%s' first. After implementing, keep the comment in place and ensure it begins with a DONE prefix (change TODO to DONE or prepend DONE if needed). If this is a pure new code block, place it after the comment; otherwise keep the existing structure and make corresponding change for the context.%s%s"
                     current-line-number current-line function-context files-context-string))
            ;; (function-name
            ;;  (format "Please implement code after all TODO comments in function '%s'. The TODOs are TODO comments. Keep each comment in place and ensure each begins with a DONE prefix (change TODO to DONE or prepend DONE if needed) before adding implementation code after it. Keep the existing code structure and only add code after these marked items.%s"

ai-code-discussion.el

@@ -387,69 +387,70 @@ or the default note file path (.ai.code.notes.org in the git root).
 Add the section title as a headline at the end of the note file, and put the
 selected region as content of that section."
   (interactive)
-  (unless (region-active-p)
-    (user-error "No region selected. Please select the text you want to save as notes"))
-  (let* ((region-text (filter-buffer-substring (region-beginning) (region-end) nil))
-         (git-root (condition-case nil
+  (let* ((git-root (condition-case nil
                        (magit-toplevel)
                      (error nil)))
          (default-note-file (if git-root
                                 (expand-file-name ai-code-notes-file-name git-root)
-                              (expand-file-name ai-code-notes-file-name default-directory)))
-         ;; Get all org-mode buffers with associated files
-         (org-buffers (seq-filter
-                       (lambda (buf)
-                         (with-current-buffer buf
-                           (and (eq major-mode 'org-mode)
-                                (buffer-file-name))))
-                       (buffer-list)))
-         (org-buffer-files (mapcar #'buffer-file-name org-buffers))
-         ;; Create candidates list with default file first, then existing org buffers
-         (candidates (delete-dups
-                      (mapcar #'file-truename
-                              (cons default-note-file org-buffer-files))))
-         ;; Select note file from candidates
-         (note-file (completing-read "Note file: " candidates nil nil (file-truename default-note-file)))
-         (default-title (when ai-code-notes-use-gptel-headline
-                          (condition-case err
-                              (string-trim
-                               (ai-code-call-gptel-sync
-                                (format "Generate a concise headline (max 10 words) for this note content. Only return the headline text without quotes or extra formatting:\n\n%s"
-                                        (if (> (length region-text) 500)
-                                            (substring region-text 0 500)
-                                          region-text))))
-                            (error
-                             (message "GPTel headline generation failed: %s" (error-message-string err))
-                             ""))))
-         (section-title (ai-code-read-string "Section title: " (or default-title ""))))
-    (when (string-empty-p section-title)
-      (user-error "Section title cannot be empty"))
-    ;; Create note file directory if it doesn't exist
-    (let ((note-dir (file-name-directory note-file)))
-      (unless (file-exists-p note-dir)
-        (make-directory note-dir t)))
-    ;; Append section to note file
-    (with-current-buffer (find-file-noselect note-file)
-      (save-excursion
-        (goto-char (point-max))
-        ;; Add newline before new section if file is not empty
-        (unless (bobp)
-          (insert "\n\n"))
-        ;; Insert headline
-        (insert "* " section-title "\n")
-        ;; Insert timestamp
-        (org-insert-time-stamp (current-time) t nil)
-        (insert "\n\n")
-        ;; Insert region content
-        (insert region-text)
-        (insert "\n"))
-      (save-buffer))
-    ;; Open note file in other window and scroll to bottom
-    (let ((note-buffer (find-file-other-window note-file)))
-      (with-selected-window (get-buffer-window note-buffer)
-        (goto-char (point-max))
-        (recenter -1)))
-    (message "Notes added to %s under section: %s" note-file section-title)))
+                              (expand-file-name ai-code-notes-file-name default-directory))))
+    (if (not (region-active-p))
+        (find-file-other-window default-note-file)
+      (let* ((region-text (filter-buffer-substring (region-beginning) (region-end) nil))
+             (default-note-file-truename (file-truename default-note-file))
+             ;; Get all org-mode buffers with associated files
+             (org-buffers (seq-filter
+                           (lambda (buf)
+                             (with-current-buffer buf
+                               (and (eq major-mode 'org-mode)
+                                    (buffer-file-name))))
+                           (buffer-list)))
+             (org-buffer-files (mapcar #'buffer-file-name org-buffers))
+             ;; Create candidates list with default file first, then existing org buffers
+             (candidates (delete-dups
+                          (mapcar #'file-truename
+                                  (cons default-note-file-truename org-buffer-files))))
+             ;; Select note file from candidates
+             (note-file (completing-read "Note file: " candidates))
+             (default-title (when ai-code-notes-use-gptel-headline
+                              (condition-case err
+                                  (string-trim
+                                   (ai-code-call-gptel-sync
+                                    (format "Generate a concise headline (max 10 words) for this note content. Only return the headline text without quotes or extra formatting:\n\n%s"
+                                            (if (> (length region-text) 500)
+                                                (substring region-text 0 500)
+                                              region-text))))
+                                (error
+                                 (message "GPTel headline generation failed: %s" (error-message-string err))
+                                 ""))))
+             (section-title (ai-code-read-string "Section title: " (or default-title ""))))
+        (when (string-empty-p section-title)
+          (user-error "Section title cannot be empty"))
+        ;; Create note file directory if it doesn't exist
+        (let ((note-dir (file-name-directory note-file)))
+          (unless (file-exists-p note-dir)
+            (make-directory note-dir t)))
+        ;; Append section to note file
+        (with-current-buffer (find-file-noselect note-file)
+          (save-excursion
+            (goto-char (point-max))
+            ;; Add newline before new section if file is not empty
+            (unless (bobp)
+              (insert "\n\n"))
+            ;; Insert headline
+            (insert "* " section-title "\n")
+            ;; Insert timestamp
+            (org-insert-time-stamp (current-time) t nil)
+            (insert "\n\n")
+            ;; Insert region content
+            (insert region-text)
+            (insert "\n"))
+          (save-buffer))
+        ;; Open note file in other window and scroll to bottom
+        (let ((note-buffer (find-file-other-window note-file)))
+          (with-selected-window (get-buffer-window note-buffer)
+            (goto-char (point-max))
+            (recenter -1)))
+        (message "Notes added to %s under section: %s" note-file section-title)))))
 
 (provide 'ai-code-discussion)