Make probject.sh comments less

project.sh

@@ -4,64 +4,56 @@ set -e
 
 projects_dir=$HOME/Projects
 
-# Print the sorted, de-duplicated list of selectable projects.
 list_projects() {
-  local projects=() dir relative git_dirs kept_roots=() root kept
+  local projects=() dir relative clone worktree projects_real
+
+  # git reports symlink-resolved paths, which may not match how we spell it.
+  projects_real=$(cd "$projects_dir" 2>/dev/null && pwd -P) ||
+    projects_real=$projects_dir
 
-  # All depth-2 directories without @ are included unconditionally
   for dir in "$projects_dir"/*/*/; do
     [ -d "$dir" ] || continue
     relative="${dir#$projects_dir/}"
     relative="${relative%/}"
-    [[ "$relative" != *@* ]] && projects+=("$relative")
+
+    if [[ "$relative" != *@* ]]; then
+      projects+=("$relative")
+      continue
+    fi
+
+    # `repo@branch` holds the worktrees of the `repo` clone, one level deeper
+    # per `/` in the branch name. Asking git beats a scan deep enough to reach
+    # them, which walks every working tree under $projects_dir. `worktree list`
+    # also names the clone itself, already added above; sort -u collapses it.
+    clone="$projects_dir/${relative%%@*}"
+    while IFS= read -r worktree; do
+      case $worktree in
+        "$projects_dir"/*) worktree=${worktree#"$projects_dir"/} ;;
+        "$projects_real"/*) worktree=${worktree#"$projects_real"/} ;;
+        *) continue ;;
+      esac
+      # Registered but deleted worktrees linger until `git worktree prune`.
+      [ -d "$projects_dir/$worktree" ] || continue
+      projects+=("$worktree")
+    done < <(git -C "$clone" worktree list --porcelain 2>/dev/null |
+      sed -n 's|^worktree ||p')
   done
 
-  # For @ directories, only show the top-most directory that holds a .git
-  # entry. Sorting makes every parent precede its descendants, so once a root
-  # is kept we drop anything nested beneath it — typically a git submodule —
-  # while separate clones and worktrees, each in their own directory, survive.
-  if command -v fd &>/dev/null; then
-    git_dirs=$(fd -H '^\.git$' "$projects_dir" || true)
-  else
-    git_dirs=$(find "$projects_dir" \( -name 'node_modules' -o -name '.git' \) \
-      -prune -name '.git' -print || true)
-  fi
-
-  while IFS= read -r root; do
-    for kept in "${kept_roots[@]}"; do
-      if [[ "$root" == "$kept/"* ]]; then
-        continue 2
-      fi
-    done
-    kept_roots+=("$root")
-    projects+=("$root")
-  done < <(printf '%s\n' "$git_dirs" |
-    grep '@' |
-    sed -E -e "s|^$projects_dir/||" -e 's|/\.git/?$||' |
-    sort -u)
-
   printf '%s\n' "${projects[@]}" | sort -u
 }
 
-# Second pass: runs inside the popup. Read the list the first pass already
-# built (so the directory scan only happens once) and open the selection.
+# Second pass: runs inside the popup, on the list the first pass built.
 if [[ "${1:-}" == --pick ]]; then
   listfile=$2
   trap 'rm -f "$listfile"' EXIT
 
-  # Cancelling fzf (Esc/^C) exits non-zero; treat it as "no selection" and
-  # leave quietly, rather than letting the status propagate out of the popup
-  # and print '...project.sh returned 130' in the parent pane.
   project=$(
     fzf --layout=reverse --info=hidden --border=rounded --cycle < "$listfile"
   ) || exit 0
   [ -n "$project" ] || exit 0
 
-  # Inside a session for this same project, e.g. one created by `session -p`,
-  # the slug only repeats the session name, so name the window after the branch
-  # checked out there instead — a worktree's whole identity. Everything up to
-  # the `@` is the clone the worktrees hang off, and tmux rewrote `.` and `:` in
-  # the session name, so match both before comparing.
+  # In a session for this same project the slug just repeats the session name,
+  # so use the branch instead. tmux rewrote `.` and `:` in the session name.
   window_name=$project
   session=$(tmux display -p '#S')
   root=${project%%@*}
@@ -76,9 +68,8 @@ if [[ "${1:-}" == --pick ]]; then
   exit
 fi
 
-# First pass: scan once, size a popup to fit the longest project name, then
-# re-launch ourselves inside it. fzf has no width of its own — it fills the
-# popup — so the popup width is what we scale.
+# First pass: size the popup, then re-launch inside it. fzf has no width of its
+# own — it fills the popup — so the popup width is what we scale.
 listfile=$(mktemp)
 list_projects > "$listfile"
 
@@ -89,23 +80,19 @@ while IFS= read -r line; do
   fi
 done < "$listfile"
 
-# We're launched from run-shell, which owns no client, so resolve the client
-# that triggered us. It both anchors the popup (-c, without which the popup
-# gets no tty and fzf can't draw) and gives the terminal width for the cap.
+# run-shell owns no client, so resolve the one that triggered us: without -c
+# the popup gets no tty and fzf can't draw.
 client=$(tmux display -p '#{client_name}')
 cols=$(tmux display -p -c "$client" '#{client_width}')
 
-# Clamp between the original fixed width and 90% of the terminal. In between,
-# pad for fzf's chrome: rounded border (2) + pointer gutter (2) + scrollbar (1)
-# + a column of breathing room.
 min=60
 max=$(( cols * 90 / 100 ))
+# 6 = border (2) + pointer gutter (2) + scrollbar (1) + breathing room.
 width=$(( longest + 6 ))
 (( width < min )) && width=$min
 (( width > max )) && width=$max
 
 flags=(-c "$client" -w "$width" -h 10)
-# Match the borderless popup the keybinding used on tmux >= 3.3.
 if ~/.config/tmux/check-version.sh ">= 3.3"; then
   flags+=(-B)
 fi