Allow non-git files in repo context candidates

Author: tninja

ai-code-file.el

@@ -477,6 +477,7 @@ Otherwise, ask AI to generate a build command."
 When no region is selected, use the full file path and current function
 \(if any).  When a region is active, use the file path with line range
 in the form filepath#Lstart-Lend."
+  ;; DONE: allow adding non git file / path to existing context candidates, it just use full path
   (interactive)
   (let* ((current-root (ai-code--git-root))
          (all-roots (let ((roots '()))
@@ -495,9 +496,24 @@ in the form filepath#Lstart-Lend."
                                 (when (and root (not (member root roots)))
                                   (push root roots)))))))
                       (nreverse roots)))
-         (ordered-roots (if (and current-root (member current-root all-roots))
-                            (cons current-root (remove current-root all-roots))
-                          all-roots))
+         (existing-roots (let ((roots '()))
+                           (maphash (lambda (root _contexts)
+                                      (when (and (stringp root)
+                                                 (not (member root roots)))
+                                        (push root roots)))
+                                    ai-code--repo-context-info)
+                           (nreverse roots)))
+         (candidate-roots (let ((roots (reverse existing-roots)))
+                            (dolist (root (reverse all-roots))
+                              (unless (member root roots)
+                                (push root roots)))
+                            (when (and current-root
+                                       (not (member current-root roots)))
+                              (push current-root roots))
+                            roots))
+         (ordered-roots (if (and current-root (member current-root candidate-roots))
+                            (cons current-root (remove current-root candidate-roots))
+                          candidate-roots))
          (repo-root (cond
                      ((null ordered-roots)
                       (user-error "Not inside a Git repository"))

test/test_ai-code-file.el

@@ -675,6 +675,36 @@ everything is cleaned up afterward."
       (ai-code-context-action '(4))
       (should completing-read-called))))
 
+(ert-deftest ai-code-test-add-context-allows-non-git-file-for-existing-repo-context ()
+  "Test `ai-code-add-context' can add a non-git file to an existing repo context."
+  (let ((ai-code--repo-context-info (make-hash-table :test #'equal))
+        (repo-root "/tmp/existing-repo/")
+        (new-file (make-temp-file "ai-code-context-")))
+    (unwind-protect
+        (with-temp-buffer
+          (setq buffer-file-name new-file)
+          (puthash repo-root
+                   '("/tmp/existing-repo/lib/existing-context.el")
+                   ai-code--repo-context-info)
+          (cl-letf (((symbol-function 'ai-code--git-root)
+                     (lambda (&optional _dir) nil))
+                    ((symbol-function 'walk-windows)
+                     (lambda (&rest _args) nil))
+                    ((symbol-function 'completing-read)
+                     (lambda (_prompt collection &rest _args)
+                       (should (equal collection (list repo-root)))
+                       repo-root))
+                    ((symbol-function 'derived-mode-p)
+                     (lambda (&rest _args) nil))
+                    ((symbol-function 'message)
+                     (lambda (&rest _args) nil)))
+            (ai-code-add-context)
+            (should (equal (gethash repo-root ai-code--repo-context-info)
+                           (list new-file
+                                 "/tmp/existing-repo/lib/existing-context.el")))))
+      (when (file-exists-p new-file)
+        (delete-file new-file)))))
+
 (ert-deftest ai-code-test-build-or-test-project-dispatches-test-project ()
   "Test selecting \"Test project\" dispatches to `ai-code-test-project'."
   (let ((test-project-called nil)