branch: elpa/aidermacs
commit 0a1e1a289df676dbdce9e83138e37473d1f4eacb
Author: Mingde (Matthew) Zeng <[email protected]>
Commit: Mingde (Matthew) Zeng <[email protected]>
Autoload transient menu correctly for emacs<30.1
Addresses #82
Signed-off-by: Mingde (Matthew) Zeng <[email protected]>
---
aidermacs-output.el | 43 +++++++++++++++++++++++++++++++++++++++----
aidermacs.el | 1 +
2 files changed, 40 insertions(+), 4 deletions(-)
diff --git a/aidermacs-output.el b/aidermacs-output.el
index d2ec8b840b..68b6feab7c 100644
--- a/aidermacs-output.el
+++ b/aidermacs-output.el
@@ -29,6 +29,39 @@
"List of files that have been mentioned in the aidermacs output.
This is used to avoid having to run /ls repeatedly.")
+(defun aidermacs--find-tracked-file (path)
+ "Check if PATH (absolute or relative) is in aidermacs--tracked-files.
+Returns the matching tracked file entry or nil if not found."
+ (let* ((project-root (aidermacs-project-root))
+ ;; Convert to relative path if it's absolute
+ (relative-path (if (file-name-absolute-p path)
+ (file-relative-name path project-root)
+ path))
+ ;; Get the basename for fallback matching
+ (basename (file-name-nondirectory path))
+ ;; Handle both regular and read-only versions
+ (possible-entries (list relative-path
+ (concat relative-path " (read-only)"))))
+ (or
+ ;; Strategy 1: Try exact matches with possible entry formats
+ (cl-find-if (lambda (tracked)
+ (member tracked possible-entries))
+ aidermacs--tracked-files)
+
+ ;; Strategy 2: Try matching by path suffix (handles path prefix
differences)
+ (cl-find-if (lambda (tracked)
+ (let ((clean-tracked (replace-regexp-in-string "
(read-only)$" "" tracked)))
+ (or (string-suffix-p clean-tracked relative-path)
+ (string-suffix-p relative-path clean-tracked))))
+ aidermacs--tracked-files)
+
+ ;; Strategy 3: Try matching by basename
+ (cl-find-if (lambda (tracked)
+ (string-match-p (regexp-quote basename)
+ (file-name-nondirectory
+ (replace-regexp-in-string " (read-only)$"
"" tracked))))
+ aidermacs--tracked-files))))
+
(defvar-local aidermacs--output-history nil
"List to store aidermacs output history.
Each entry is a cons cell (timestamp . output-text).")
@@ -179,10 +212,12 @@ Only adds the hook if it's not already present."
(when-let* ((file (match-string 2 line)))
(add-to-list 'aidermacs--tracked-files file)))
- ;; Removed <filename> from the chat (with or without ./ prefix)
- ((string-match "Removed \\(\\./\\)?\\(.+\\) from the chat" line)
- (when-let* ((file (match-string 2 line)))
- (setq aidermacs--tracked-files (delete file
aidermacs--tracked-files))))
+ ;; Removed <filename> from the chat (handling read-only, relative and
full paths)
+ ((string-match "Removed \\(read-only file\\)? \\(\\./\\)?\\(.+\\)
from the chat" line)
+ (when-let* ((raw-path (match-string 3 line))
+ (tracked-file (aidermacs--find-tracked-file raw-path)))
+ (setq aidermacs--tracked-files (delete tracked-file
aidermacs--tracked-files))
+ (message "Removed %s from tracked files" tracked-file)))
;; Added <filename> to read-only files.
((string-match "Added \\(\\./\\)?\\(.+\\) to read-only files" line)
diff --git a/aidermacs.el b/aidermacs.el
index 013b51bded..bd0df6a8ae 100644
--- a/aidermacs.el
+++ b/aidermacs.el
@@ -129,6 +129,7 @@ This function tries multiple methods to determine the
project root."
This is the file name without path."
:type 'string)
+;;;###autoload (autoload 'aidermacs-transient-menu "aidermacs" nil t)
(transient-define-prefix aidermacs-transient-menu ()
"AI Pair Programming Interface."
["Aidermacs: AI Pair Programming"
