@humanu/orchestra 0.5.72 → 0.5.74

package/package.json

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

package/resources/api/tmux.sh

@@ -416,6 +416,80 @@ _tmux_registry_sync_active_workspace_sessions() {
   done < <(tmux list-sessions -F '#{session_name}' 2>/dev/null || true)
 }
 
+_tmux_workspace_cycle_target_cached() {
+  local current_session="$1"
+  local direction="$2"
+  local db_path="$3"
+  local active_file="$4"
+
+  python3 - "$db_path" "$current_session" "$direction" "$active_file" <<'PY'
+import sqlite3
+import sys
+
+db_path, current_session, direction, active_path = sys.argv[1:5]
+active = set()
+active_orchestra = set()
+with open(active_path, "r", encoding="utf-8") as handle:
+    for raw_line in handle:
+        line = raw_line.rstrip("\n")
+        if not line:
+            continue
+        parts = line.split("\t", 1)
+        name = parts[0].strip()
+        display_name = parts[1].strip() if len(parts) > 1 else ""
+        if not name:
+            continue
+        active.add(name)
+        if display_name:
+            active_orchestra.add(name)
+
+try:
+    conn = sqlite3.connect(db_path)
+    current_row = conn.execute(
+        "SELECT repo_root FROM sessions WHERE tmux_name = ?1",
+        (current_session,),
+    ).fetchone()
+    if current_row is None:
+        raise SystemExit(2)
+
+    registered = {
+        name
+        for (name,) in conn.execute("SELECT tmux_name FROM sessions").fetchall()
+    }
+    if active_orchestra.difference(registered):
+        raise SystemExit(2)
+
+    rows = conn.execute(
+        """
+        SELECT tmux_name
+        FROM sessions
+        WHERE repo_root = ?1
+        ORDER BY worktree_path COLLATE NOCASE, created_at, tmux_name COLLATE NOCASE
+        """,
+        (current_row[0],),
+    ).fetchall()
+except sqlite3.Error:
+    raise SystemExit(2)
+
+names = []
+seen = set()
+for (name,) in rows:
+    if name in active and name not in seen:
+        names.append(name)
+        seen.add(name)
+
+if len(names) < 2 or current_session not in seen:
+    raise SystemExit(3)
+
+index = names.index(current_session)
+if direction == "next":
+    index = (index + 1) % len(names)
+else:
+    index = (index - 1) % len(names)
+print(names[index])
+PY
+}
+
 _tmux_status_escape_text() {
   local text="$1"
   text="${text//\#/##}"
@@ -424,9 +498,9 @@ _tmux_status_escape_text() {
 
 _tmux_truncate_tab_label() {
   local label="$1"
-  local max_len="${2:-18}"
+  local max_len="${2:-14}"
   if (( ${#label} > max_len )); then
-    printf '%s...' "${label:0:$((max_len - 3))}"
+    printf '%s' "${label:0:max_len}"
   else
     printf '%s' "$label"
   fi
@@ -506,7 +580,9 @@ PY
 _tmux_workspace_session_tabs() {
   local current_session="$1"
   local fallback_display_name="$2"
-  local session_dir repo_root rows tabs name display_name label escaped_label divider
+  local session_dir repo_root rows tabs name display_name tab_label escaped_tab_label divider active_style inactive_style muted_style reset_style
+  local tab_max_width=24
+  local active_label_max_width=22
 
   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)"
@@ -518,34 +594,42 @@ _tmux_workspace_session_tabs() {
   fi
 
   if [[ -z "$rows" ]]; then
-    label="$(_tmux_truncate_tab_label "$fallback_display_name")"
-    escaped_label="$(_tmux_status_escape_text "$label")"
-    printf '#[fg=white,bg=colour22,bold] %s #[default]' "$escaped_label"
+    tab_label="$(_tmux_truncate_tab_label "$fallback_display_name" "$active_label_max_width")"
+    escaped_tab_label="$(_tmux_status_escape_text "$tab_label")"
+    printf '#[bg=#414868] #[fg=#ff9e64,bg=#414868,bold]● #[fg=#c0caf5,bg=#414868,bold]%s #[default]' "$escaped_tab_label"
     return
   fi
 
+  # Tokyo Night palette: midnight footer, muted inactive tabs, orange active marker.
+  active_style="#[fg=#c0caf5,bg=#414868,bold]"
+  inactive_style="#[fg=#a9b1d6,bg=#24283b,nobold]"
+  muted_style="#[fg=#565f89,bg=#1a1b26,nobold]"
+  reset_style="#[default]"
   tabs=""
-  divider="#[fg=white,bg=colour22] | #[default]"
+  divider="${muted_style}|${reset_style}"
   while IFS=$'\t' read -r name display_name; do
     [[ -n "$name" ]] || continue
     if [[ -n "$tabs" ]]; then
       tabs+="$divider"
     fi
     if [[ "$name" == "__ellipsis__" ]]; then
-      tabs+="#[fg=white,bg=colour22]  ...  #[default]"
+      tab_label="⋯"
+      escaped_tab_label="$(_tmux_status_escape_text "$tab_label")"
+      tabs+="${muted_style} ${escaped_tab_label} ${reset_style}"
       continue
     fi
 
     if [[ -z "$display_name" ]]; then
       display_name="$(tmux_format_session_display "$name" without-timestamp)"
     fi
-    label="$(_tmux_truncate_tab_label "$display_name")"
-    escaped_label="$(_tmux_status_escape_text "$label")"
-
     if [[ "$name" == "$current_session" ]]; then
-      tabs+="#[fg=white,bg=colour22,bold]  [${escaped_label}]  #[default]"
+      tab_label="$(_tmux_truncate_tab_label "$display_name" "$active_label_max_width")"
+      escaped_tab_label="$(_tmux_status_escape_text "$tab_label")"
+      tabs+="#[bg=#414868] #[fg=#ff9e64,bg=#414868,bold]● ${active_style}${escaped_tab_label} ${reset_style}"
     else
-      tabs+="#[fg=white,bg=colour22]  ${escaped_label}  #[default]"
+      tab_label="$(_tmux_truncate_tab_label "$display_name" "$tab_max_width")"
+      escaped_tab_label="$(_tmux_status_escape_text "$tab_label")"
+      tabs+="${inactive_style} ${escaped_tab_label} ${reset_style}"
     fi
   done <<< "$rows"
 
@@ -559,7 +643,7 @@ _tmux_orchestra_status_left() {
 }
 
 _tmux_orchestra_status_right() {
-  printf ''
+  printf '#[fg=#565f89,bg=#1a1b26]Ctrl+b,h for help#[default]'
 }
 
 _tmux_configure_orchestra_bindings() {
@@ -577,6 +661,8 @@ _tmux_configure_orchestra_bindings() {
 
   tmux bind-key -T prefix '?' if-shell -F '#{@orchestra_display_name}' \
     "run-shell -b \"$help_command\"" 'list-keys -N' >/dev/null 2>&1 || true
+  tmux bind-key -T prefix h if-shell -F '#{@orchestra_display_name}' \
+    "run-shell -b \"$help_command\"" 'refresh-client -S' >/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}' \
@@ -604,10 +690,11 @@ _tmux_configure_orchestra_status() {
   tmux set-option -t "$session_name" @orchestra_worktree_name "$worktree_name" >/dev/null 2>&1 || true
   tmux set-option -t "$session_name" status on >/dev/null 2>&1 || true
   tmux set-option -t "$session_name" status-position bottom >/dev/null 2>&1 || true
+  tmux set-option -t "$session_name" status-style "fg=#c0caf5,bg=#1a1b26" >/dev/null 2>&1 || true
   tmux set-option -t "$session_name" status-left "$status_left" >/dev/null 2>&1 || true
   tmux set-option -t "$session_name" status-left-length 1000 >/dev/null 2>&1 || true
   tmux set-option -t "$session_name" status-right "$status_right" >/dev/null 2>&1 || true
-  tmux set-option -t "$session_name" status-right-length 0 >/dev/null 2>&1 || true
+  tmux set-option -t "$session_name" status-right-length 40 >/dev/null 2>&1 || true
   tmux set-option -t "$session_name" window-status-format "" >/dev/null 2>&1 || true
   tmux set-option -t "$session_name" window-status-current-format "" >/dev/null 2>&1 || true
   tmux set-option -t "$session_name" window-status-separator "" >/dev/null 2>&1 || true
@@ -1416,21 +1503,32 @@ tmux_show_orchestra_help_popup() {
   fi
 
   local popup_command
-  popup_command='printf "%s\n" \
+  popup_command="$(cat <<'EOF'
+bash -lc '
+trap "exit 0" INT TERM
+printf "%s\n" \
 "Orchestra tmux shortcuts" \
 "" \
+"Ctrl+b, d         Detach and return to Orchestra" \
+"Ctrl+b, r         Rename the current Orchestra session" \
+"" \
 "Ctrl+b, Left      Previous Orchestra session in this workspace" \
 "Ctrl+b, Right     Next Orchestra session in this workspace" \
 "Ctrl+b, <         Previous Orchestra session in this workspace" \
 "Ctrl+b, >         Next Orchestra session in this workspace" \
-"Ctrl+b, r         Rename the current Orchestra session" \
-"Ctrl+b, d         Detach and return to Orchestra" \
+"" \
 "Ctrl+b, [         Copy/scroll mode" \
+"Ctrl+b, h         Show this help" \
 "Ctrl+b, ?         Show this help" \
 "" \
-"Press Enter to close..."; read -r _'
+"Press any key to close..."
+IFS= read -rsn1 _ || true
+exit 0
+'
+EOF
+)"
 
-  tmux display-popup "${target_args[@]}" -E -w 78 -h 15 -T "Orchestra shortcuts" "$popup_command" >/dev/null 2>&1
+  tmux display-popup "${target_args[@]}" -E -w 78 -h 18 -T "Orchestra shortcuts" "$popup_command" >/dev/null 2>&1 || true
 }
 
 # Find the adjacent active Orchestra session registered for the current repo.
@@ -1438,7 +1536,7 @@ tmux_show_orchestra_help_popup() {
 tmux_workspace_cycle_target() {
   local current_session="$1"
   local direction="$2"
-  local session_dir repo_root db_path active_file target
+  local session_dir repo_root db_path active_file target query_status
 
   if ! tmux_available; then
     err "tmux not installed"
@@ -1456,40 +1554,64 @@ tmux_workspace_cycle_target() {
       ;;
   esac
 
+  db_path="$(_tmux_session_registry_path)"
+  have_cmd python3 || {
+    err "python3 is required to read the Orchestra session registry"
+    return 1
+  }
+
+  active_file="$(mktemp)"
+  tmux list-sessions -F $'#{session_name}\t#{@orchestra_display_name}' > "$active_file" 2>/dev/null || {
+    rm -f "$active_file"
+    err "Unable to list tmux sessions"
+    return 1
+  }
+
+  if [[ -f "$db_path" ]]; then
+    if target="$(_tmux_workspace_cycle_target_cached "$current_session" "$direction" "$db_path" "$active_file")"; then
+      query_status=0
+    else
+      query_status=$?
+    fi
+    if [[ $query_status -eq 0 && -n "$target" ]]; then
+      rm -f "$active_file"
+      printf '%s\n' "$target"
+      return 0
+    fi
+    if [[ $query_status -eq 3 ]]; then
+      rm -f "$active_file"
+      return 1
+    fi
+  fi
+
   _tmux_registry_upsert_current_session "$current_session" >/dev/null 2>&1 || true
 
   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
+    rm -f "$active_file"
     err "Unable to determine Orchestra workspace for session"
     return 1
   fi
   _tmux_registry_sync_active_workspace_sessions "$repo_root" >/dev/null 2>&1 || true
 
-  db_path="$(_tmux_session_registry_path)"
   if [[ ! -f "$db_path" ]]; then
+    rm -f "$active_file"
     err "No Orchestra session registry found"
     return 1
   fi
-  have_cmd python3 || {
-    err "python3 is required to read the Orchestra session registry"
-    return 1
-  }
-
-  active_file="$(mktemp)"
-  tmux list-sessions -F '#{session_name}' > "$active_file" 2>/dev/null || {
-    rm -f "$active_file"
-    err "Unable to list tmux sessions"
-    return 1
-  }
 
-  target="$(python3 - "$db_path" "$repo_root" "$current_session" "$direction" "$active_file" <<'PY'
+  if target="$(python3 - "$db_path" "$repo_root" "$current_session" "$direction" "$active_file" <<'PY'
 import sqlite3
 import sys
 
 db_path, repo_root, current_session, direction, active_path = sys.argv[1:6]
 with open(active_path, "r", encoding="utf-8") as handle:
-    active = {line.strip() for line in handle if line.strip()}
+    active = {
+        line.rstrip("\n").split("\t", 1)[0].strip()
+        for line in handle
+        if line.rstrip("\n").split("\t", 1)[0].strip()
+    }
 
 conn = sqlite3.connect(db_path)
 rows = conn.execute(
@@ -1519,8 +1641,11 @@ else:
     index = (index - 1) % len(names)
 print(names[index])
 PY
-  )"
-  local query_status=$?
+  )"; then
+    query_status=0
+  else
+    query_status=$?
+  fi
   rm -f "$active_file"
   if [[ $query_status -ne 0 ]]; then
     err "Unable to query Orchestra session registry"
@@ -1543,13 +1668,15 @@ tmux_cycle_workspace_session() {
     return 1
   fi
 
-  _tmux_refresh_orchestra_session_status "$target_session" >/dev/null 2>&1 || true
-
   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_refresh_orchestra_session_status "$target_session" >/dev/null 2>&1 || true
+  } &
 }
 
 # Load .env file if it exists