@humanu/orchestra 0.5.75 → 0.5.77

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@humanu/orchestra",
-  "version": "0.5.75",
+  "version": "0.5.77",
   "description": "AI-powered Git worktree and tmux session manager with modern TUI",
   "keywords": [
     "git",

package/resources/api/tmux.sh

@@ -506,9 +506,18 @@ _tmux_truncate_tab_label() {
   fi
 }
 
+_tmux_pad_menu_label() {
+  local label="$1"
+  local width="${2:-56}"
+
+  label="$(_tmux_truncate_tab_label "$label" "$width")"
+  printf '%-*s' "$width" "$label"
+}
+
 _tmux_workspace_session_rows() {
   local current_session="$1"
   local repo_root="$2"
+  local mode="${3:-visible}"
   local db_path active_file
   db_path="$(_tmux_session_registry_path)"
 
@@ -521,11 +530,11 @@ _tmux_workspace_session_rows() {
     return 0
   }
 
-  python3 - "$db_path" "$repo_root" "$current_session" "$active_file" <<'PY'
+  python3 - "$db_path" "$repo_root" "$current_session" "$active_file" "$mode" <<'PY'
 import sqlite3
 import sys
 
-db_path, repo_root, current_session, active_path = sys.argv[1:5]
+db_path, repo_root, current_session, active_path, mode = sys.argv[1:6]
 with open(active_path, "r", encoding="utf-8") as handle:
     active = {line.strip() for line in handle if line.strip()}
 
@@ -551,7 +560,7 @@ if not filtered:
     raise SystemExit(0)
 
 max_tabs = 8
-if len(filtered) <= max_tabs:
+if mode == "all" or len(filtered) <= max_tabs:
     visible = filtered
     prefix = suffix = False
 else:
@@ -636,10 +645,21 @@ _tmux_workspace_session_tabs() {
   printf '%s' "$tabs"
 }
 
+_tmux_current_session_label() {
+  local session_display_name="$1"
+  local label escaped_label
+
+  label="$(_tmux_truncate_tab_label "$session_display_name" 28)"
+  escaped_label="$(_tmux_status_escape_text "$label")"
+  printf '#[fg=#7aa2f7,bg=#1a1b26,bold] %s #[fg=#565f89,bg=#1a1b26,nobold]│#[default]' "$escaped_label"
+}
+
 _tmux_orchestra_status_left() {
   local session_name="$1"
   local session_display_name="$3"
-  _tmux_workspace_session_tabs "$session_name" "$session_display_name"
+  printf '%s%s' \
+    "$(_tmux_current_session_label "$session_display_name")" \
+    "$(_tmux_workspace_session_tabs "$session_name" "$session_display_name")"
 }
 
 _tmux_orchestra_status_right() {
@@ -651,14 +671,17 @@ _tmux_configure_orchestra_bindings() {
   bridge="$(_orchestra_bridge_script)"
   [[ -f "$bridge" ]] || return
 
-  local quoted_bridge rename_command prompt_command next_command previous_command new_session_command help_command
+  local quoted_bridge rename_command prompt_command next_command previous_command new_session_command list_command close_command close_prompt_command help_command
   printf -v quoted_bridge '%q' "$bridge"
   rename_command="$quoted_bridge manual-rename-session \\\"#{session_name}\\\" \\\"%%\\\" >/dev/null 2>&1"
   prompt_command="command-prompt -p 'Rename Orchestra session:' 'run-shell -b \"$rename_command\"'"
   next_command="$quoted_bridge cycle-workspace-session \\\"#{session_name}\\\" next \\\"#{client_tty}\\\" >/dev/null 2>&1"
   previous_command="$quoted_bridge cycle-workspace-session \\\"#{session_name}\\\" previous \\\"#{client_tty}\\\" >/dev/null 2>&1"
-  new_session_command="$quoted_bridge create-workspace-session \\\"#{session_name}\\\" \\\"#{client_tty}\\\" >/dev/null 2>&1"
-  help_command="$quoted_bridge tmux-help-popup \\\"#{client_tty}\\\" >/dev/null 2>&1"
+  new_session_command="$quoted_bridge create-workspace-session \\\"#{session_name}\\\" \\\"#{client_tty}\\\" >/dev/null 2>&1 || true"
+  list_command="$quoted_bridge workspace-session-menu \\\"#{session_name}\\\" \\\"#{client_tty}\\\" >/dev/null 2>&1 || true"
+  close_command="$quoted_bridge close-workspace-session \\\"#{session_name}\\\" \\\"#{client_tty}\\\" >/dev/null 2>&1 || true"
+  close_prompt_command="confirm-before -p 'Close current Orchestra session? (y/n)' 'run-shell -b \"$close_command\"'"
+  help_command="$quoted_bridge tmux-help-popup \\\"#{client_tty}\\\" >/dev/null 2>&1 || true"
 
   tmux bind-key -T prefix '?' if-shell -F '#{@orchestra_display_name}' \
     "run-shell -b \"$help_command\"" 'list-keys -N' >/dev/null 2>&1 || true
@@ -666,6 +689,12 @@ _tmux_configure_orchestra_bindings() {
     "run-shell -b \"$help_command\"" 'refresh-client -S' >/dev/null 2>&1 || true
   tmux bind-key -T prefix n if-shell -F '#{@orchestra_display_name}' \
     "run-shell -b \"$new_session_command\"" 'next-window' >/dev/null 2>&1 || true
+  tmux bind-key -T prefix l if-shell -F '#{@orchestra_display_name}' \
+    "run-shell -b \"$list_command\"" 'last-window' >/dev/null 2>&1 || true
+  tmux bind-key -T prefix q if-shell -F '#{@orchestra_display_name}' \
+    "$close_prompt_command" 'display-panes' >/dev/null 2>&1 || true
+  tmux bind-key -T prefix X if-shell -F '#{@orchestra_display_name}' \
+    "$close_prompt_command" 'confirm-before -p "kill-session #S? (y/n)" kill-session' >/dev/null 2>&1 || true
   tmux bind-key -T prefix r if-shell -F '#{@orchestra_display_name}' \
     "$prompt_command" 'refresh-client -S' >/dev/null 2>&1 || true
   tmux bind-key -T prefix '>' if-shell -F '#{@orchestra_display_name}' \
@@ -944,6 +973,37 @@ tmux_create_workspace_session() {
   printf '%s\n' "$new_session"
 }
 
+# Close the current Orchestra session after switching the client to the next one.
+# Usage: tmux_close_workspace_session <current_session> [client_tty]
+tmux_close_workspace_session() {
+  local current_session="$1"
+  local target_client="${2:-}"
+  local target_session
+
+  if ! tmux_available; then
+    err "tmux not installed"
+    return 1
+  fi
+  if [[ -z "$current_session" ]]; then
+    err "tmux_close_workspace_session: current session required"
+    return 1
+  fi
+
+  if ! target_session="$(tmux_workspace_cycle_target "$current_session" next)"; then
+    tmux display-message -d 2500 "No other Orchestra sessions; current session kept" 2>/dev/null || true
+    return 1
+  fi
+
+  if [[ -n "$target_client" ]]; then
+    tmux switch-client -c "$target_client" -t "$target_session" >/dev/null 2>&1 || return 1
+  else
+    tmux switch-client -t "$target_session" >/dev/null 2>&1 || return 1
+  fi
+
+  tmux_kill_session "$current_session" >/dev/null 2>&1 || return 1
+  _tmux_refresh_orchestra_session_status "$target_session" >/dev/null 2>&1 || true
+}
+
 # Check if a session exists
 # Usage: tmux_session_exists <session_name>
 tmux_session_exists() {
@@ -1556,6 +1616,8 @@ printf "%s\n" \
 "Ctrl+b, d         Detach and return to Orchestra" \
 "Ctrl+b, r         Rename the current Orchestra session" \
 "Ctrl+b, n         New Orchestra session in this worktree" \
+"Ctrl+b, q         Close current session and switch next" \
+"Ctrl+b, l         List active sessions" \
 "" \
 "Ctrl+b, Left      Previous Orchestra session in this workspace" \
 "Ctrl+b, Right     Next Orchestra session in this workspace" \
@@ -1573,7 +1635,89 @@ exit 0
 EOF
 )"
 
-  tmux display-popup "${target_args[@]}" -E -w 78 -h 18 -T "Orchestra shortcuts" "$popup_command" >/dev/null 2>&1 || true
+  tmux display-popup "${target_args[@]}" \
+    -E \
+    -w 84 \
+    -h 22 \
+    -s "fg=#c0caf5,bg=#1a1b26" \
+    -S "fg=#7aa2f7,bg=#1a1b26" \
+    -T "Orchestra shortcuts" \
+    "$popup_command" >/dev/null 2>&1 || true
+}
+
+# Show active Orchestra sessions in a native tmux menu for arrow-key selection.
+# Usage: tmux_show_workspace_session_menu <current_session> [client_tty]
+tmux_show_workspace_session_menu() {
+  local current_session="$1"
+  local target_client="${2:-}"
+  local session_dir repo_root rows name display_name label target_command
+  local menu_width=56
+  local min_menu_rows=10
+  local menu_row_count=0
+
+  if ! tmux_available; then
+    err "tmux not installed"
+    return 1
+  fi
+  if [[ -z "$current_session" ]]; then
+    err "tmux_show_workspace_session_menu: current session required"
+    return 1
+  fi
+
+  session_dir="$(tmux display-message -t "$current_session" -p '#{pane_current_path}' 2>/dev/null || echo "")"
+  repo_root="$(_tmux_shared_root_for_path "$session_dir" 2>/dev/null || true)"
+  if [[ -z "$repo_root" ]]; then
+    tmux display-message -d 2500 "Unable to determine Orchestra workspace" 2>/dev/null || true
+    return 1
+  fi
+
+  _tmux_registry_sync_active_workspace_sessions "$repo_root" >/dev/null 2>&1 || true
+  rows="$(_tmux_workspace_session_rows "$current_session" "$repo_root" all 2>/dev/null || true)"
+  if [[ -z "$rows" ]]; then
+    tmux display-message -d 2500 "No active Orchestra sessions in this workspace" 2>/dev/null || true
+    return 1
+  fi
+
+  local target_args=()
+  if [[ -n "$target_client" ]]; then
+    target_args=(-c "$target_client")
+  fi
+
+  local menu_items=()
+  while IFS=$'\t' read -r name display_name; do
+    [[ -n "$name" && "$name" != "__ellipsis__" ]] || continue
+    if [[ -z "$display_name" ]]; then
+      display_name="$(tmux_format_session_display "$name" without-timestamp)"
+    fi
+    label="$(_tmux_truncate_tab_label "$display_name" 42)"
+    if [[ "$name" == "$current_session" ]]; then
+      label="● $label"
+    else
+      label="  $label"
+    fi
+    label="$(_tmux_pad_menu_label "$label" "$menu_width")"
+    label="$(_tmux_status_escape_text "$label")"
+    target_command="switch-client -t \"$name\""
+    menu_items+=("$label" "" "$target_command")
+    menu_row_count=$((menu_row_count + 1))
+  done <<< "$rows"
+
+  if [[ ${#menu_items[@]} -eq 0 ]]; then
+    tmux display-message -d 2500 "No active Orchestra sessions in this workspace" 2>/dev/null || true
+    return 1
+  fi
+
+  while (( menu_row_count < min_menu_rows )); do
+    menu_items+=("$(_tmux_pad_menu_label "" "$menu_width")" "" "")
+    menu_row_count=$((menu_row_count + 1))
+  done
+
+  tmux display-menu "${target_args[@]}" \
+    -s "fg=#c0caf5,bg=#1a1b26" \
+    -S "fg=#7aa2f7,bg=#1a1b26" \
+    -H "fg=#1a1b26,bg=#ff9e64,bold" \
+    -T "Orchestra sessions" \
+    "${menu_items[@]}" >/dev/null 2>&1 || true
 }
 
 # Find the adjacent active Orchestra session registered for the current repo.

package/resources/scripts/gw-bridge.sh

@@ -102,6 +102,14 @@ case "${1:-}" in
     bridge_create_workspace_session "${2:-}" "${3:-}"
     ;;
 
+  "close-workspace-session")
+    bridge_close_workspace_session "${2:-}" "${3:-}"
+    ;;
+
+  "workspace-session-menu")
+    bridge_workspace_session_menu "${2:-}" "${3:-}"
+    ;;
+
   "kill-session")
     bridge_kill_session "${2:-}"
     ;;
@@ -249,6 +257,10 @@ Commands:
                                     Switch within registered Orchestra sessions for this repo
   create-workspace-session <session> [client]
                                     Create a new session in the current worktree and switch to it
+  close-workspace-session <session> [client]
+                                    Close current session after switching to the next one
+  workspace-session-menu <session> [client]
+                                    Show an interactive active-session menu
   tmux-help-popup [client]          Show Orchestra tmux shortcut popup
   repo-info                         Get repository information
   git-status                        Get git status --porcelain

package/resources/scripts/shell/bridge/tmux.sh

@@ -82,6 +82,46 @@ bridge_create_workspace_session() {
   fi
 }
 
+# Close current tmux session after switching to the next workspace session.
+bridge_close_workspace_session() {
+  if [[ -z "${1:-}" ]]; then
+    json_error "Current session name required"
+    return 1
+  fi
+  session_name="$1"
+  target_client="${2:-}"
+
+  if tmux_available; then
+    tmux_close_workspace_session "$session_name" "$target_client" || {
+      json_error "Failed to close workspace session"
+      return 1
+    }
+    json_object "ok:b=true"
+  else
+    json_error "tmux not available"
+  fi
+}
+
+# Show interactive workspace session menu.
+bridge_workspace_session_menu() {
+  if [[ -z "${1:-}" ]]; then
+    json_error "Current session name required"
+    return 1
+  fi
+  session_name="$1"
+  target_client="${2:-}"
+
+  if tmux_available; then
+    tmux_show_workspace_session_menu "$session_name" "$target_client" || {
+      json_error "Failed to show workspace session menu"
+      return 1
+    }
+    json_object "ok:b=true"
+  else
+    json_error "tmux not available"
+  fi
+}
+
 # Kill tmux session
 bridge_kill_session() {
   if [[ -z "${1:-}" ]]; then