fix: resolve tmux reattach workspace list paths (#66)

* chore: initialize tmux reattach workspace list fix

* fix: resolve tmux reattach workspace list paths

* fix: preserve tmux reattach paths across switches

* fix: normalize tmux cwd paths to workspace aliases

* fix: restore tmux reattach send targets

* fix: preserve duplicate tmux project cwds

* fix: harden tmux mirror target resolution

* fix: expose imported tmux window aliases

* docs: document tmux reattach aliases

---------

Co-authored-by: Yoshitsugu Sekine <yoshitsugu.sekine@offisis.co.jp>

Author: phasetr

README.org

@@ -166,7 +166,8 @@ and the cheat-sheet ensures you never miss useful functionality.
 
 *** Prerequisites
 - Emacs 30.1 or later
-- [[https://github.com/akib/emacs-eat][eat]] (0.9.4 or later)
+- [[https://github.com/tmux/tmux][tmux]] for the default backend
+- [[https://github.com/akib/emacs-eat][eat]] (0.9.4 or later) only when using the legacy =eat= backend
 
 *Note*: This package has been developed and tested exclusively on macOS with GNU Emacs 30.1.
 While it should work on other platforms and Emacs versions (30.1+),
@@ -263,7 +264,7 @@ Currently operates with a single fixed workspace (=ws:01=), with multi-workspace
 - =enkan-repl-workspace-delete= - Delete a workspace and stop all associated terminal resources. This is the only interactive workspace deletion command.  In `enkan-repl-workspace-list-mode', delete the workspace at point; otherwise delete the current workspace.  With prefix ARG, prompt for a workspace. Noninteractive string ARG deletes that workspace ID.  All paths use `enkan-repl--delete-workspace-completely'.
 
 *** Utilities
-- =enkan-repl-tmux-reattach= - Reconnect Emacs state to live tmux sessions. FILE defaults to `enkan-repl-state-file'.  Live tmux sessions whose names start with `enkan-repl-tmux-session-prefix' define the workspaces to restore.  When a matching persisted workspace exists, its saved state is reused.  When no saved state exists for a live tmux session, a minimal workspace is imported from the tmux session's windows so reattach works after Emacs state was lost.  This command is intentionally manual; enkan-repl does not reattach on load.
+- =enkan-repl-tmux-reattach= - Reconnect Emacs state to live tmux sessions. FILE defaults to `enkan-repl-state-file'.  Live tmux sessions whose names start with `enkan-repl-tmux-session-prefix' define the workspaces to restore.  When a matching persisted workspace exists, its saved state is reused.  When no saved state exists for a live tmux session, a minimal workspace is imported from the tmux session's windows so reattach works after Emacs state was lost. Imported tmux window names become the workspace aliases used by send commands, workspace-list path display, and project-directory selection.  This command is intentionally manual; enkan-repl does not reattach on load.
 - =enkan-repl-recenter-bottom= - Recenter all enkan terminal buffers at bottom.
 - =enkan-repl-toggle-global-mode= - Toggle enkan-repl global mode on/off.
 - =enkan-repl-workspace-switch= - Switch to another workspace. Uses `hmenu' if available to show workspace ID with its project.
@@ -328,8 +329,11 @@ same user-facing send / layout commands (=enkan-repl-send-line=,
   Live =enkan-*= tmux sessions define the workspaces to restore.  When
   saved state exists for a live workspace it is reused; when it does not,
   enkan-repl imports a minimal workspace from the tmux windows so the
-  session can be used again.  Reattach ensures mirror buffers exist, but
-  it avoids force-refreshing every restored workspace; use
+  session can be used again.  Imported tmux window names become workspace
+  aliases, so =enkan-repl-send-line=, =enkan-repl-workspace-list=, and
+  =enkan-repl-open-project-directory= can resolve every live window even
+  when the Emacs state file was missing.  Reattach ensures mirror buffers
+  exist, but it avoids force-refreshing every restored workspace; use
   =M-x enkan-repl-tmux-refresh-workspace= when you explicitly want to
   refresh the current workspace's mirror contents.
 

enkan-repl-constants.el

@@ -11,7 +11,7 @@
 ;;; Code:
 
 (defconst enkan-repl-cheat-sheet-candidates
-  '(("enkan-repl-tmux-reattach" . "Reconnect Emacs state to live tmux sessions. FILE defaults to `enkan-repl-state-file'.  Live tmux sessions whose names start with `enkan-repl-tmux-session-prefix' define the workspaces to restore.  When a matching persisted workspace exists, its saved state is reused.  When no saved state exists for a live tmux session, a minimal workspace is imported from the tmux session's windows so reattach works after Emacs state was lost.  This command is intentionally manual; enkan-repl does not reattach on load.")
+  '(("enkan-repl-tmux-reattach" . "Reconnect Emacs state to live tmux sessions. FILE defaults to `enkan-repl-state-file'.  Live tmux sessions whose names start with `enkan-repl-tmux-session-prefix' define the workspaces to restore.  When a matching persisted workspace exists, its saved state is reused.  When no saved state exists for a live tmux session, a minimal workspace is imported from the tmux session's windows so reattach works after Emacs state was lost. Imported tmux window names become the workspace aliases used by send commands, workspace-list path display, and project-directory selection.  This command is intentionally manual; enkan-repl does not reattach on load.")
     ("enkan-repl-send-region" . "Send region text (from START to END) to enkan session buffer with optional PFX. - From enkan buffer: Send to current buffer - From other buffer without prefix: Interactive buffer selection - With numeric prefix: Send to buffer at index (1-based)  Uses unified backend with smart buffer detection.  Category: Text Sender")
     ("enkan-repl-send-line" . "Send current line to enkan session buffer with optional PFX. - From enkan buffer: Send to current buffer - From other buffer without prefix: Interactive buffer selection - With numeric prefix: Send to buffer at index (1-based)  Uses unified backend with smart buffer detection.  Category: Text Sender")
     ("enkan-repl-send-enter" . "Send enter key to enkan session buffer with optional PFX. - From enkan buffer: Send to current buffer - From other buffer without prefix: Interactive buffer selection - With numeric prefix: Send to buffer at index (1-based)  Uses unified backend with smart buffer detection.  Category: Text Sender")
@@ -27,7 +27,7 @@
     ("enkan-repl-cheat-sheet" . "Display interactive `cheat-sheet' for enkan-repl commands.  Category: Command Palette")
     ("enkan-repl-toggle-global-mode" . "Toggle enkan-repl global mode on/off.")
     ("enkan-repl-send-escape" . "Send ESC key to enkan session buffer with optional PFX. - If called from enkan buffer: Send ESC to current buffer - If called from center file without prefix: Select from available enkan buffers - With numeric prefix: Send to buffer at that index (1-based)  Category: Center File Multi-buffer Access")
-    ("enkan-repl-open-project-directory" . "Open project directory in Dired from enkan-repl-projects with optional PFX. With prefix argument (\\\\[universal-argument]), select from available buffers.  Category: Center File Multi-buffer Access")
+    ("enkan-repl-open-project-directory" . "Open the current workspace's project directory in Dired with optional PFX. Directory choices are resolved from `enkan-repl-projects' plus the current workspace's aliases and target directories, including aliases imported by `enkan-repl-tmux-reattach'. With prefix argument (\\\\[universal-argument]), select from available buffers.  Category: Center File Multi-buffer Access")
     ("enkan-repl-open-center-file" . "Open or create the center file based on enkan-repl-center-file configuration.  Category: Center File Operations")
     ("enkan-repl-print-setup-to-buffer" . "Print current setup variables for debugging. Displays enkan-repl-projects, enkan-repl-target-directories, enkan-repl-project-aliases, and current session state.  Category: Debugging")
     ("enkan-repl-workspace-switch" . "Switch to another workspace. Uses `hmenu' if available to show workspace ID with its project.")

enkan-repl-terminal.el

@@ -185,6 +185,14 @@ Returns 1 when ID has no explicit instance suffix."
 
 ;;;; eat backend
 
+(defun enkan-repl--terminal-eat--live-process (buffer)
+  "Return BUFFER's live eat process, or nil."
+  (when (and buffer (buffer-live-p buffer))
+    (with-current-buffer buffer
+      (let ((proc (or (and (boundp 'eat--process) eat--process)
+                      (get-buffer-process buffer))))
+        (and proc (process-live-p proc) proc)))))
+
 (defun enkan-repl--terminal-eat-start (dir)
   "Eat backend: create eat session in DIR and rename to enkan buffer name.
 Return the eat buffer."
@@ -231,10 +239,7 @@ NEWLINE non-nil appends a CR after TEXT."
 
 (defun enkan-repl--terminal-eat-alive-p (id)
   "Eat backend: t if buffer ID has a live process."
-  (and id
-       (buffer-live-p id)
-       (let ((proc (get-buffer-process id)))
-         (and proc (process-live-p proc)))))
+  (and (enkan-repl--terminal-eat--live-process id) t))
 
 (defun enkan-repl--terminal-eat-list ()
   "Eat backend: list of live enkan buffers in current workspace."
@@ -247,8 +252,7 @@ NEWLINE non-nil appends a CR after TEXT."
               (buffer-name buf)
               (enkan-repl--buffer-name-matches-workspace
                (buffer-name buf) current-ws)
-              (let ((proc (get-buffer-process buf)))
-                (and proc (process-live-p proc)))))
+              (enkan-repl--terminal-eat--live-process buf)))
        (buffer-list)))))
 
 (defun enkan-repl--terminal-eat-kill (id)
@@ -362,6 +366,22 @@ or nil on non-zero exit.  Otherwise return t on zero exit, nil on non-zero."
         (split-string out "\n" t)
       nil)))
 
+(defun enkan-repl--terminal-tmux--list-window-cwds (session)
+  "Return list of (WINDOW . CWD) pairs in tmux SESSION."
+  (let ((out (enkan-repl--terminal-tmux--call
+              (list "list-windows" "-t" session "-F"
+                    "#{window_name}\t#{pane_current_path}")
+              t)))
+    (when (and out (not (string-empty-p out)))
+      (delq
+       nil
+       (mapcar
+        (lambda (line)
+          (pcase-let ((`(,window ,cwd) (split-string line "\t")))
+            (when (and window cwd (not (string-empty-p window)))
+              (cons window (unless (string-empty-p cwd) cwd)))))
+        (split-string out "\n" t))))))
+
 (defun enkan-repl--terminal-tmux--derive-base-name (dir)
   "Derive a base window name from DIR (file-name-nondirectory of cleaned dir)."
   (let* ((clean (directory-file-name (expand-file-name dir)))
@@ -1026,7 +1046,7 @@ buffer-list-based layout and send-target lookup can find tmux mirrors."
              enkan-repl--current-workspace)))
     (enkan-repl--path->buffer-name
      (file-name-as-directory path)
-     (enkan-repl--terminal-tmux-id-instance id))))
+     (enkan-repl--terminal-tmux-id-instance-for-path id path))))
 
 (defun enkan-repl--terminal-tmux--mirror-buffer-name (id &optional path)
   "Return mirror buffer name for tmux ID without calling tmux.
@@ -1436,6 +1456,8 @@ the asynchronous lookup returns."
       (unless (derived-mode-p 'enkan-repl-tmux-mirror-mode)
         (enkan-repl-tmux-mirror-mode))
       (setq enkan-repl--tmux-mirror-id id)
+      (when path
+        (enkan-repl--terminal-tmux--mirror-rename-for-cwd buf id path))
       (enkan-repl--terminal-tmux--mirror-update-status)
       (unless path
         (enkan-repl--terminal-tmux--mirror-start-cwd-lookup buf id))
@@ -1542,6 +1564,23 @@ Returns 1 when no \"-N\" suffix is present."
       (string-to-number (match-string 1 win)))
      (t 1))))
 
+(defun enkan-repl--terminal-tmux-id-instance-for-path (id path)
+  "Return tmux ID's instance index relative to PATH.
+A numeric suffix is treated as an instance only when the tmux window name is
+the PATH basename followed by -N.  This keeps projects whose real names end in
+digits, such as foo-2, at instance 1."
+  (let* ((win (enkan-repl--terminal-tmux--id-window id))
+         (base (and (stringp path)
+                    (enkan-repl--terminal-tmux--derive-base-name path))))
+    (cond
+     ((and win base (string= win base)) 1)
+     ((and win base
+           (string-match
+            (format "\\`%s-\\([0-9]+\\)\\'" (regexp-quote base))
+            win))
+      (string-to-number (match-string 1 win)))
+     (t 1))))
+
 ;;;###autoload
 (defun enkan-repl-tmux-kill-session (&optional session)
   "Kill a tmux SESSION (defaults to the current workspace's enkan session).

enkan-repl-utils.el

@@ -64,8 +64,10 @@ enkan buffer name."
 
 (defun enkan-repl--path->buffer-name (path &optional instance)
   "Generate buffer name from PATH, optionally with INSTANCE suffix.
-Returns buffer name in format *ws:<id> enkan:<expanded-path>* (instance 1
-or unspecified) or *ws:<id> enkan:<expanded-path>*<N> (instance >= 2).
+PATH is normalized as a directory, so `/p' and `/p/' produce the same buffer
+name.  Returns buffer name in format *ws:<id> enkan:<expanded-directory>*
+\(instance 1 or unspecified) or *ws:<id> enkan:<expanded-directory>*<N>
+\(instance >= 2).
 Workspace ID is taken from `enkan-repl--current-workspace' when available;
 otherwise falls back to \"01\"."
   (let* ((ws (when (boundp 'enkan-repl--current-workspace)
@@ -74,7 +76,8 @@ otherwise falls back to \"01\"."
                          (string-match-p "^[0-9][0-9]$" ws))
                     ws
                   "01"))
-         (base (format "*ws:%s enkan:%s*" ws-id (expand-file-name path))))
+         (directory (file-name-as-directory (expand-file-name path)))
+         (base (format "*ws:%s enkan:%s*" ws-id directory)))
     (if (and instance (integerp instance) (> instance 1))
         (format "%s<%d>" base instance)
       base)))
@@ -424,7 +427,7 @@ Returns a list of plists, each containing :name, :args, :docstring,
                     (in-docstring nil)
                     (docstring-lines '()))
                 (while (and (< next-line-idx (length lines))
-                            (< next-line-idx (+ current-line 10))) ; reasonable limit
+                            (< next-line-idx (+ current-line 40))) ; reasonable limit
                   (let ((next-line (nth next-line-idx lines)))
                     (cond
                      ;; Start of docstring

enkan-repl-workspace-list.el

@@ -24,6 +24,8 @@
 (declare-function enkan-repl--save-workspace-state "enkan-repl" ())
 (declare-function enkan-repl--load-workspace-state "enkan-repl" (workspace-id))
 (declare-function enkan-repl--get-project-paths-for-current "enkan-repl" (current-project projects target-directories))
+(declare-function enkan-repl--projects-with-current-aliases "enkan-repl" (projects current-project project-aliases))
+(declare-function enkan-repl--get-project-info-from-directories "enkan-repl-utils" (alias target-directories))
 (declare-function enkan-repl-workspace-delete "enkan-repl" (&optional arg))
 (declare-function enkan-repl-setup "enkan-repl" ())
 
@@ -50,6 +52,40 @@
   (setq buffer-read-only t)
   (setq truncate-lines t))
 
+(defun enkan-repl-workspace-list--project-alias-names (aliases)
+  "Return alias names from ALIASES.
+ALIASES may be a list of strings or an alist of (alias . project-name)."
+  (delq nil
+        (mapcar (lambda (entry)
+                  (cond
+                   ((stringp entry) entry)
+                   ((consp entry) (car entry))))
+                aliases)))
+
+(defun enkan-repl-workspace-list--project-paths (state target-directories)
+  "Return displayable project paths for workspace STATE.
+TARGET-DIRECTORIES is the fallback global directory registry."
+  (let* ((current-project (plist-get state :current-project))
+         (workspace-dirs (or (plist-get state :target-directories)
+                             target-directories))
+         (paths (when current-project
+                  (enkan-repl--get-project-paths-for-current
+                   current-project
+                   (enkan-repl--projects-with-current-aliases
+                    (bound-and-true-p enkan-repl-projects)
+                    current-project
+                    (plist-get state :project-aliases))
+                   workspace-dirs))))
+    (or paths
+        (cl-loop for alias in (enkan-repl-workspace-list--project-alias-names
+                               (or (plist-get state :project-aliases)
+                                   (and current-project
+                                        (list current-project))))
+                 for info = (enkan-repl--get-project-info-from-directories
+                             alias workspace-dirs)
+                 when info
+                 collect (cons alias (cdr info))))))
+
 (defun enkan-repl-workspace-list--format-workspace-info (workspace-id workspaces current-workspace target-directories)
   "Format workspace information for display.
 WORKSPACE-ID is the workspace identifier.
@@ -59,12 +95,8 @@ TARGET-DIRECTORIES is the list of target directories."
   (let* ((state (enkan-repl--get-workspace-state workspaces workspace-id))
           (current-project (plist-get state :current-project))
           (is-current (string= workspace-id current-workspace))
-          ;; Get project paths using existing function
-          (project-paths (when current-project
-                           (enkan-repl--get-project-paths-for-current
-                             current-project
-                             (bound-and-true-p enkan-repl-projects)
-                             target-directories)))
+          (project-paths
+           (enkan-repl-workspace-list--project-paths state target-directories))
           ;; Format all paths when multiple targets exist
           (project-dirs (if project-paths
                           (mapconcat (lambda (pair) (cdr pair))