addressing feedbacks

Author: tninja

ai-code-mcp-server.el

@@ -14,6 +14,7 @@
 (require 'cl-lib)
 (require 'imenu)
 (require 'project)
+(require 'seq)
 (require 'subr-x)
 (require 'xref)
 
@@ -218,15 +219,29 @@ Required keys are `:function', `:name', and `:description'."
               "No active buffer")
             file-count)))
 
+(defun ai-code-mcp--validate-buffer-query-range (start-line num-lines)
+  "Validate optional buffer query range arguments START-LINE and NUM-LINES."
+  (when (or (and start-line (not num-lines))
+            (and num-lines (not start-line)))
+    (error "Arguments start_line and num_lines must both be provided or both be omitted"))
+  (when (and start-line
+             (or (< start-line 1)
+                 (< num-lines 1)))
+    (error "Arguments start_line and num_lines must be positive integers")))
+
+(defun ai-code-mcp--drop-trailing-newline (text)
+  "Return TEXT without a single trailing newline."
+  (if (string-suffix-p "\n" text)
+      (substring text 0 -1)
+    text))
+
 (defun ai-code-mcp-buffer-query (buffer-name &optional start-line num-lines)
   "Return contents from BUFFER-NAME.
 When START-LINE and NUM-LINES are non-nil, return only that line range."
   (let ((buffer (get-buffer buffer-name)))
     (if (not buffer)
         (format "Error: Buffer not found: %s" buffer-name)
-      (when (or (and start-line (not num-lines))
-                (and num-lines (not start-line)))
-        (error "Arguments start_line and num_lines must both be provided or both be omitted"))
+      (ai-code-mcp--validate-buffer-query-range start-line num-lines)
       (with-current-buffer buffer
         (save-excursion
           (if (not start-line)
@@ -235,18 +250,50 @@ When START-LINE and NUM-LINES are non-nil, return only that line range."
             (forward-line (1- start-line))
             (let ((start-pos (point)))
               (forward-line num-lines)
-              (string-trim-right
+              (ai-code-mcp--drop-trailing-newline
                (buffer-substring-no-properties start-pos (point))))))))))
 
+(defun ai-code-mcp--project-files (project-dir)
+  "Return absolute regular files inside PROJECT-DIR."
+  (let* ((default-directory (file-name-as-directory project-dir))
+         (project (project-current nil project-dir))
+         (project-root default-directory))
+    (or (ignore-errors
+          (when (and project (fboundp 'project-files))
+            (seq-filter
+             #'file-regular-p
+             (mapcar (lambda (file)
+                       (if (file-name-absolute-p file)
+                           file
+                         (expand-file-name file project-root)))
+                     (project-files project)))))
+        (cl-labels
+            ((collect-files (dir)
+               (apply
+                #'append
+                (mapcar
+                 (lambda (entry)
+                   (cond
+                    ((member entry '("." "..")) nil)
+                    ((string-prefix-p "." entry) nil)
+                    (t
+                     (let ((path (expand-file-name entry dir)))
+                       (cond
+                        ((file-directory-p path)
+                         (collect-files path))
+                        ((file-regular-p path)
+                         (list path))
+                        (t nil))))))
+                 (directory-files dir nil nil t)))))
+          (collect-files project-root)))))
+
 (defun ai-code-mcp-get-project-files ()
   "Return regular files in the current project as relative paths."
   (let ((project-dir (ai-code-mcp--project-directory)))
     (if (not (and project-dir (file-directory-p project-dir)))
         nil
       (mapcar #'ai-code-mcp--display-path
-              (seq-filter
-               #'file-regular-p
-               (directory-files-recursively project-dir ".*" t))))))
+              (ai-code-mcp--project-files project-dir)))))
 
 (defun ai-code-mcp-get-project-buffers ()
   "Return open buffers that belong to the current project."
@@ -473,12 +520,16 @@ When WHOLE-FILE is non-nil, inspect the root node instead."
 
 (defun ai-code-mcp--display-path (file-path)
   "Return FILE-PATH relative to the active project when possible."
-  (let ((project-dir (ai-code-mcp--project-directory)))
-    (if (and project-dir
-             (string-prefix-p (expand-file-name project-dir)
-                              (expand-file-name file-path)))
-        (file-relative-name file-path project-dir)
-      (file-name-nondirectory file-path))))
+  (let* ((expanded-path (and file-path (expand-file-name file-path)))
+         (project-dir (ai-code-mcp--project-directory))
+         (project-root (and project-dir
+                            (file-name-as-directory
+                             (expand-file-name project-dir)))))
+    (if (and expanded-path
+             project-root
+             (file-in-directory-p expanded-path project-root))
+        (file-relative-name expanded-path project-root)
+      expanded-path)))
 
 (defun ai-code-mcp--require-file-path (file-path)
   "Return FILE-PATH as an absolute path or signal an error."

test/test_ai-code-mcp-server.el

@@ -228,6 +228,13 @@
             (should (member "sample.el:4: beta" result))))
       (delete-directory project-dir t))))
 
+(ert-deftest ai-code-test-mcp-server-source-requires-seq-explicitly ()
+  "The MCP server source should declare its seq dependency explicitly."
+  (with-temp-buffer
+    (insert-file-contents "ai-code-mcp-server.el")
+    (goto-char (point-min))
+    (should (search-forward "(require 'seq)" nil t))))
+
 (ert-deftest ai-code-test-mcp-buffer-query-returns-selected-buffer-lines ()
   "Buffer query should return the requested line range from a live buffer."
   (let ((buffer (generate-new-buffer " *ai-code-mcp-buffer-query*")))
@@ -242,6 +249,33 @@
       (when (buffer-live-p buffer)
         (kill-buffer buffer)))))
 
+(ert-deftest ai-code-test-mcp-buffer-query-preserves-trailing-whitespace ()
+  "Buffer query should preserve trailing whitespace in the selected text."
+  (let ((buffer (generate-new-buffer " *ai-code-mcp-buffer-query-whitespace*")))
+    (unwind-protect
+        (with-current-buffer buffer
+          (insert "alpha\nbeta  \n")
+          (should (equal "beta  "
+                         (ai-code-mcp-buffer-query
+                          (buffer-name buffer)
+                          2
+                          1))))
+      (when (buffer-live-p buffer)
+        (kill-buffer buffer)))))
+
+(ert-deftest ai-code-test-mcp-buffer-query-requires-positive-line-range ()
+  "Buffer query should reject non-positive line range arguments."
+  (let ((buffer (generate-new-buffer " *ai-code-mcp-buffer-query-range*")))
+    (unwind-protect
+        (with-current-buffer buffer
+          (insert "alpha\nbeta\n")
+          (should-error
+           (ai-code-mcp-buffer-query (buffer-name buffer) 0 1))
+          (should-error
+           (ai-code-mcp-buffer-query (buffer-name buffer) 1 0)))
+      (when (buffer-live-p buffer)
+        (kill-buffer buffer)))))
+
 (ert-deftest ai-code-test-mcp-get-project-files-returns-relative-project-paths ()
   "Project files should list regular files relative to the session project root."
   (let* ((project-dir (make-temp-file "ai-code-mcp-project-files-" t))
@@ -264,6 +298,35 @@
         (kill-buffer buffer))
       (delete-directory project-dir t))))
 
+(ert-deftest ai-code-test-mcp-get-project-files-skips-hidden-directories ()
+  "Project files should skip hidden directories such as .git."
+  (let* ((project-dir (make-temp-file "ai-code-mcp-project-files-hidden-" t))
+         (file-a (expand-file-name "alpha.el" project-dir))
+         (file-b (expand-file-name "nested/beta.el" project-dir))
+         (hidden-file (expand-file-name ".git/HEAD" project-dir))
+         (buffer (generate-new-buffer " *ai-code-mcp-project-files-hidden*"))
+         (ai-code-mcp--sessions (make-hash-table :test 'equal))
+         (ai-code-mcp--current-session-id "session-project-files-hidden"))
+    (unwind-protect
+        (progn
+          (make-directory (file-name-directory file-b) t)
+          (make-directory (file-name-directory hidden-file) t)
+          (with-temp-file file-a
+            (insert "(message \"alpha\")\n"))
+          (with-temp-file file-b
+            (insert "(message \"beta\")\n"))
+          (with-temp-file hidden-file
+            (insert "ref: refs/heads/main\n"))
+          (ai-code-mcp-register-session
+           "session-project-files-hidden"
+           project-dir
+           buffer)
+          (should (equal '("alpha.el" "nested/beta.el")
+                         (sort (ai-code-mcp-get-project-files) #'string<))))
+      (when (buffer-live-p buffer)
+        (kill-buffer buffer))
+      (delete-directory project-dir t))))
+
 (ert-deftest ai-code-test-mcp-get-project-buffers-lists-open-buffers-in-project ()
   "Project buffers should include file-visiting buffers under the active project."
   (let* ((project-dir (make-temp-file "ai-code-mcp-project-buffers-" t))
@@ -309,7 +372,7 @@
   "Definitions-at-point should resolve via the xref backend at a file location."
   (let* ((project-dir (make-temp-file "ai-code-mcp-xref-defs-" t))
          (file-path (expand-file-name "defs.el" project-dir))
-         (buffer (generate-new-buffer " *ai-code-mcp-xref-defs*")))
+         visited-buffer)
     (unwind-protect
         (progn
           (with-temp-file file-path
@@ -330,10 +393,63 @@
                            (ai-code-mcp-xref-find-definitions-at-point
                             file-path
                             2
-                            3)))))
+                            3))))
+          (setq visited-buffer (find-buffer-visiting file-path)))
+      (when (buffer-live-p visited-buffer)
+        (kill-buffer visited-buffer))
+      (delete-directory project-dir t))))
+
+(ert-deftest ai-code-test-mcp-display-path-keeps-external-sibling-absolute ()
+  "Display path should keep sibling paths outside the project absolute."
+  (let* ((project-dir (make-temp-file "ai-code-mcp-display-path-" t))
+         (sibling-dir (concat project-dir "-sibling"))
+         (external-file (expand-file-name "other.el" sibling-dir))
+         (buffer (generate-new-buffer " *ai-code-mcp-display-path*"))
+         (ai-code-mcp--sessions (make-hash-table :test 'equal))
+         (ai-code-mcp--current-session-id "session-display-path"))
+    (unwind-protect
+        (progn
+          (make-directory sibling-dir t)
+          (with-temp-file external-file
+            (insert "(message \"other\")\n"))
+          (ai-code-mcp-register-session "session-display-path" project-dir buffer)
+          (should (equal (expand-file-name external-file)
+                         (ai-code-mcp--display-path external-file))))
       (when (buffer-live-p buffer)
         (kill-buffer buffer))
-      (delete-directory project-dir t))))
+      (let ((visited-buffer (find-buffer-visiting external-file)))
+        (when (buffer-live-p visited-buffer)
+          (kill-buffer visited-buffer)))
+      (delete-directory project-dir t)
+      (delete-directory sibling-dir t))))
+
+(ert-deftest ai-code-test-mcp-format-xref-item-preserves-external-absolute-path ()
+  "Xref items outside the project should keep their absolute file path."
+  (let* ((project-dir (make-temp-file "ai-code-mcp-xref-project-" t))
+         (external-dir (make-temp-file "ai-code-mcp-xref-external-" t))
+         (external-file (expand-file-name "index.el" external-dir))
+         (buffer (generate-new-buffer " *ai-code-mcp-xref-format*"))
+         (ai-code-mcp--sessions (make-hash-table :test 'equal))
+         (ai-code-mcp--current-session-id "session-xref-format"))
+    (unwind-protect
+        (progn
+          (with-temp-file external-file
+            (insert "(message \"external\")\n"))
+          (ai-code-mcp-register-session "session-xref-format" project-dir buffer)
+          (should (equal
+                   (format "%s:1: external summary"
+                           (expand-file-name external-file))
+                   (ai-code-mcp--format-xref-item
+                    (xref-make
+                     "external summary"
+                     (xref-make-file-location external-file 1 0))))))
+      (when (buffer-live-p buffer)
+        (kill-buffer buffer))
+      (let ((visited-buffer (find-buffer-visiting external-file)))
+        (when (buffer-live-p visited-buffer)
+          (kill-buffer visited-buffer)))
+      (delete-directory project-dir t)
+      (delete-directory external-dir t))))
 
 (provide 'test_ai-code-mcp-server)