@humanu/orchestra 0.5.73 → 0.5.75

package/package.json

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

package/resources/api/tmux.sh

@@ -434,7 +434,7 @@ with open(active_path, "r", encoding="utf-8") as handle:
         line = raw_line.rstrip("\n")
         if not line:
             continue
-        parts = line.split("\t", 1)
+        parts = line.split("\t")
         name = parts[0].strip()
         display_name = parts[1].strip() if len(parts) > 1 else ""
         if not name:
@@ -506,14 +506,6 @@ _tmux_truncate_tab_label() {
   fi
 }
 
-_tmux_pad_tab_label() {
-  local label="$1"
-  local width="${2:-14}"
-
-  label="$(_tmux_truncate_tab_label "$label" "$width")"
-  printf '%-*s' "$width" "$label"
-}
-
 _tmux_workspace_session_rows() {
   local current_session="$1"
   local repo_root="$2"
@@ -589,8 +581,8 @@ _tmux_workspace_session_tabs() {
   local current_session="$1"
   local fallback_display_name="$2"
   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_width=21
-  local active_label_width=19
+  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)"
@@ -602,7 +594,7 @@ _tmux_workspace_session_tabs() {
   fi
 
   if [[ -z "$rows" ]]; then
-    tab_label="$(_tmux_pad_tab_label "$fallback_display_name" "$active_label_width")"
+    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
@@ -621,7 +613,7 @@ _tmux_workspace_session_tabs() {
       tabs+="$divider"
     fi
     if [[ "$name" == "__ellipsis__" ]]; then
-      tab_label="$(_tmux_pad_tab_label "⋯" "$tab_width")"
+      tab_label="⋯"
       escaped_tab_label="$(_tmux_status_escape_text "$tab_label")"
       tabs+="${muted_style} ${escaped_tab_label} ${reset_style}"
       continue
@@ -631,11 +623,11 @@ _tmux_workspace_session_tabs() {
       display_name="$(tmux_format_session_display "$name" without-timestamp)"
     fi
     if [[ "$name" == "$current_session" ]]; then
-      tab_label="$(_tmux_pad_tab_label "$display_name" "$active_label_width")"
+      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
-      tab_label="$(_tmux_pad_tab_label "$display_name" "$tab_width")"
+      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
@@ -651,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() {
@@ -659,16 +651,21 @@ _tmux_configure_orchestra_bindings() {
   bridge="$(_orchestra_bridge_script)"
   [[ -f "$bridge" ]] || return
 
-  local quoted_bridge rename_command prompt_command next_command previous_command help_command
+  local quoted_bridge rename_command prompt_command next_command previous_command new_session_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"
 
   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 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 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}' \
@@ -700,7 +697,7 @@ _tmux_configure_orchestra_status() {
   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
@@ -906,6 +903,47 @@ tmux_ensure_session() {
   _tmux_source_command_hook "$sess"
 }
 
+# Create a new auto-named Orchestra session in the current session's worktree and switch to it.
+# Uses the same tmux_ensure_session path as the TUI tree view create action.
+# Usage: tmux_create_workspace_session <current_session> [client_tty]
+tmux_create_workspace_session() {
+  local current_session="$1"
+  local target_client="${2:-}"
+  local session_dir branch slug new_session
+
+  if ! tmux_available; then
+    err "tmux not installed"
+    return 1
+  fi
+  if [[ -z "$current_session" ]]; then
+    err "tmux_create_workspace_session: current session required"
+    return 1
+  fi
+
+  session_dir="$(tmux display-message -t "$current_session" -p '#{pane_current_path}' 2>/dev/null || echo "")"
+  if [[ -z "$session_dir" || ! -d "$session_dir" ]]; then
+    err "Unable to determine current worktree path"
+    return 1
+  fi
+
+  branch="$(_tmux_branch_for_path "$session_dir" 2>/dev/null || true)"
+  if [[ -z "$branch" || "$branch" == "detached" ]]; then
+    err "Unable to determine current worktree branch"
+    return 1
+  fi
+
+  slug="$(git_branch_to_slug "$branch")"
+  new_session="$(tmux_ensure_session "$slug" "" "$session_dir")" || return 1
+
+  if [[ -n "$target_client" ]]; then
+    tmux switch-client -c "$target_client" -t "$new_session" >/dev/null 2>&1 || return 1
+  else
+    tmux switch-client -t "$new_session" >/dev/null 2>&1 || return 1
+  fi
+
+  printf '%s\n' "$new_session"
+}
+
 # Check if a session exists
 # Usage: tmux_session_exists <session_name>
 tmux_session_exists() {
@@ -1083,7 +1121,7 @@ tmux_rename_session() {
 
 # --------------------------- Session Discovery ------------------------------
 
-# Get tmux sessions for a slug prefix; prints session names sorted by last attached/activity
+# Get tmux sessions for a slug prefix; prints session names sorted by creation time, oldest first
 # Expected session format: [worktreename]_[worktreehash]_[datetime]_[readable_name]
 # Usage: tmux_list_sessions_for_slug <slug> [worktree_path]
 tmux_list_sessions_for_slug() {
@@ -1114,19 +1152,19 @@ tmux_list_sessions_for_slug() {
     fi
 
     # List sessions with any known prefix variant
-    tmux list-sessions -F '#{session_name}|||#{session_last_attached}|||#{session_activity}' 2>/dev/null \
+    tmux list-sessions -F '#{session_name}|||#{session_created}' 2>/dev/null \
       | sed 's/|||/\t/g' \
-      | awk -v a="$p1_new" -v b="$p2_new" -v c="$p1_old" -v d="$p2_old" -v e="$p1_branch_hash" -v f="$p2_branch_hash" 'BEGIN{FS="\t"} (length(a)>0 && index($1, a)==1) || (length(b)>0 && index($1, b)==1) || (length(c)>0 && index($1, c)==1) || (length(d)>0 && index($1, d)==1) || (length(e)>0 && index($1, e)==1) || (length(f)>0 && index($1, f)==1) {print $1"\t"$2"\t"$3}' \
-      | sort -t $'\t' -k2,2nr -k3,3nr \
+      | awk -v a="$p1_new" -v b="$p2_new" -v c="$p1_old" -v d="$p2_old" -v e="$p1_branch_hash" -v f="$p2_branch_hash" 'BEGIN{FS="\t"} (length(a)>0 && index($1, a)==1) || (length(b)>0 && index($1, b)==1) || (length(c)>0 && index($1, c)==1) || (length(d)>0 && index($1, d)==1) || (length(e)>0 && index($1, e)==1) || (length(f)>0 && index($1, f)==1) {print $1"\t"$2}' \
+      | sort -t $'\t' -k2,2n -k1,1f \
       | awk -F '\t' '{print $1}' | awk '!seen[$0]++' || true
   else
     # New-format prefix matching without hash: orchestra__slug__... or slug__...
     local prefix1="${ORCH_PREFIX}${slug}${d}"
     local prefix2="${slug}${d}"
-    tmux list-sessions -F '#{session_name}|||#{session_last_attached}|||#{session_activity}' 2>/dev/null \
+    tmux list-sessions -F '#{session_name}|||#{session_created}' 2>/dev/null \
       | sed 's/|||/\t/g' \
-      | awk -v p1="$prefix1" -v p2="$prefix2" 'BEGIN{FS="\t"} index($1, p1)==1 || index($1, p2)==1 {print $1"\t"$2"\t"$3}' \
-      | sort -t $'\t' -k2,2nr -k3,3nr \
+      | awk -v p1="$prefix1" -v p2="$prefix2" 'BEGIN{FS="\t"} index($1, p1)==1 || index($1, p2)==1 {print $1"\t"$2}' \
+      | sort -t $'\t' -k2,2n -k1,1f \
       | awk -F '\t' '{print $1}' || true
   fi
 }
@@ -1509,21 +1547,33 @@ 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, n         New Orchestra session in this worktree" \
+"" \
 "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.
@@ -1556,7 +1606,7 @@ tmux_workspace_cycle_target() {
   }
 
   active_file="$(mktemp)"
-  tmux list-sessions -F $'#{session_name}\t#{@orchestra_display_name}' > "$active_file" 2>/dev/null || {
+  tmux list-sessions -F $'#{session_name}\t#{@orchestra_display_name}\t#{session_last_attached}\t#{session_activity}' > "$active_file" 2>/dev/null || {
     rm -f "$active_file"
     err "Unable to list tmux sessions"
     return 1

package/resources/scripts/gw-bridge.sh

@@ -97,7 +97,11 @@ case "${1:-}" in
   "create-session-exact")
     bridge_create_session_exact "${2:-}" "${3:-}"
     ;;
-    
+
+  "create-workspace-session")
+    bridge_create_workspace_session "${2:-}" "${3:-}"
+    ;;
+
   "kill-session")
     bridge_kill_session "${2:-}"
     ;;
@@ -243,6 +247,8 @@ Commands:
   copy-env-files <source> <target>  Copy .env files between directories
   cycle-workspace-session <session> <next|previous> [client]
                                     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
   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

@@ -62,6 +62,26 @@ bridge_create_session_exact() {
   fi
 }
 
+# Create a new tmux session in the current session's worktree and switch to it.
+bridge_create_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
+    created_session="$(tmux_create_workspace_session "$session_name" "$target_client")" || {
+      json_error "Failed to create workspace session"
+      return 1
+    }
+    json_object "ok:b=true" "session:s=$created_session"
+  else
+    json_error "tmux not available"
+  fi
+}
+
 # Kill tmux session
 bridge_kill_session() {
   if [[ -z "${1:-}" ]]; then