@humanu/orchestra 0.5.65 → 0.5.66

package/package.json

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

package/resources/api/tmux.sh

@@ -109,6 +109,57 @@ _tmux_normalize_app_from_command() {
   printf '%s' "$base"
 }
 
+_tmux_truthy() {
+  case "$(printf '%s' "$1" | tr '[:upper:]' '[:lower:]')" in
+    1|yes|true|on)
+      return 0
+      ;;
+  esac
+  return 1
+}
+
+_tmux_is_known_tui_app() {
+  local app
+  app="$(_tmux_normalize_app_from_command "$1")"
+  case "$app" in
+    opencode|claude|vim|nvim|vi|lazygit|gitui|tig|top|htop|btop|k9s|fzf|yazi|ranger|nnn|less|man)
+      return 0
+      ;;
+  esac
+  return 1
+}
+
+_tmux_is_tui_context() {
+  local pane_cmd="$1"
+  local alternate_on="$2"
+  local mouse_any_flag="$3"
+  local pane_mode="$4"
+  local window_name="$5"
+  local pane_title="$6"
+
+  if _tmux_truthy "$alternate_on" || _tmux_truthy "$mouse_any_flag"; then
+    return 0
+  fi
+
+  if [[ -n "$pane_mode" ]]; then
+    return 0
+  fi
+
+  if _tmux_is_known_tui_app "$pane_cmd"; then
+    return 0
+  fi
+
+  local combined
+  combined="$(printf '%s %s' "$window_name" "$pane_title" | tr '[:upper:]' '[:lower:]')"
+  case "$combined" in
+    *opencode*|*claude*|*vim*|*nvim*|*lazygit*|*gitui*|*tig*|*k9s*|*fzf*|*yazi*|*ranger*|*nnn*)
+      return 0
+      ;;
+  esac
+
+  return 1
+}
+
 # Helper: absolute path to the command hook script (if present)
 _orchestra_command_hook() {
   local hook=""
@@ -1077,15 +1128,13 @@ tmux_generate_ai_session_name() {
 
   local openai_model="${OPENAI_MODEL:-gpt-4o-mini}"
   
-  # Capture the tmux pane content (last 200 lines for better context)
-  local content
-  content="$(tmux capture-pane -t "$session" -p -S -200 2>/dev/null)" || {
-    err "Failed to capture tmux pane content"
-    return 1
-  }
-
-  local pane_cmd
+  local pane_cmd pane_mode window_name pane_title alternate_on mouse_any_flag
   pane_cmd="$(tmux display-message -t "$session" -p '#{pane_current_command}' 2>/dev/null || echo "")"
+  pane_mode="$(tmux display-message -t "$session" -p '#{pane_mode}' 2>/dev/null || echo "")"
+  window_name="$(tmux display-message -t "$session" -p '#{window_name}' 2>/dev/null || echo "")"
+  pane_title="$(tmux display-message -t "$session" -p '#{pane_title}' 2>/dev/null || echo "")"
+  alternate_on="$(tmux display-message -t "$session" -p '#{alternate_on}' 2>/dev/null || echo "0")"
+  mouse_any_flag="$(tmux display-message -t "$session" -p '#{mouse_any_flag}' 2>/dev/null || echo "0")"
 
   local history_temp=""
   local history_arg=""
@@ -1100,6 +1149,27 @@ tmux_generate_ai_session_name() {
   local session_key
   session_key="$(_orchestra_history_key "$session")"
 
+  local is_tui="false"
+  if _tmux_is_tui_context "$pane_cmd" "$alternate_on" "$mouse_any_flag" "$pane_mode" "$window_name" "$pane_title"; then
+    is_tui="true"
+  fi
+
+  local content=""
+  local visible_content=""
+  if [[ "$is_tui" == "true" ]]; then
+    visible_content="$(tmux capture-pane -e -p -q -a -t "${pane_id:-$session}" 2>/dev/null || echo "")"
+  fi
+  local scrollback_content
+  scrollback_content="$(tmux capture-pane -t "$session" -p -S -200 2>/dev/null)" || {
+    err "Failed to capture tmux pane content"
+    return 1
+  }
+  if [[ -n "$visible_content" ]]; then
+    content="### Visible terminal view\n${visible_content}\n\n### Recent scrollback\n${scrollback_content}"
+  else
+    content="$scrollback_content"
+  fi
+
   local app_source_path=""
   if [[ -n "$pane_key" && -f "$history_dir/$pane_key.last_app" ]]; then
     app_source_path="$history_dir/$pane_key.last_app"
@@ -1131,6 +1201,16 @@ tmux_generate_ai_session_name() {
     history_arg="$history_temp"
   fi
   
+  local metadata_block=""
+  metadata_block+="Session metadata:\n"
+  metadata_block+="- pane_current_command: ${pane_cmd:-unknown}\n"
+  metadata_block+="- window_name: ${window_name:-}\n"
+  metadata_block+="- pane_title: ${pane_title:-}\n"
+  metadata_block+="- pane_mode: ${pane_mode:-}\n"
+  metadata_block+="- alternate_screen_active: ${alternate_on:-0}\n"
+  metadata_block+="- mouse_mode_active: ${mouse_any_flag:-0}\n"
+  metadata_block+="- likely_tui_app: ${is_tui}\n"
+
   # If content is empty or too short, keep a placeholder
   if [[ ${#content} -lt 10 ]]; then
     content="(no terminal output captured)"
@@ -1157,7 +1237,7 @@ tmux_generate_ai_session_name() {
   if have_cmd python3; then
     # Use Python to safely build the request body and extract typed commands from the capture
     request_payload=$(
-      python3 - "$temp_file" "$history_arg" "$provider" "$openai_model" 2>/dev/null <<'PYCODE'
+      python3 - "$temp_file" "$history_arg" "$provider" "$openai_model" "$pane_cmd" "$window_name" "$pane_title" "$pane_mode" "$alternate_on" "$mouse_any_flag" "$is_tui" 2>/dev/null <<'PYCODE'
 import json
 import re
 import sys
@@ -1168,6 +1248,13 @@ content = temp_path.read_text()
 history_arg = sys.argv[2] if len(sys.argv) > 2 else ""
 provider = sys.argv[3] if len(sys.argv) > 3 else "anthropic"
 openai_model = sys.argv[4] if len(sys.argv) > 4 and sys.argv[4] else "gpt-4o-mini"
+pane_cmd = sys.argv[5] if len(sys.argv) > 5 else ""
+window_name = sys.argv[6] if len(sys.argv) > 6 else ""
+pane_title = sys.argv[7] if len(sys.argv) > 7 else ""
+pane_mode = sys.argv[8] if len(sys.argv) > 8 else ""
+alternate_on = sys.argv[9] if len(sys.argv) > 9 else "0"
+mouse_any_flag = sys.argv[10] if len(sys.argv) > 10 else "0"
+is_tui = sys.argv[11] if len(sys.argv) > 11 else "false"
 
 lines = content.splitlines()
 command_candidates = []  # Commands captured with high confidence
@@ -1444,11 +1531,28 @@ description_guidance = """Description rules:
 - Do NOT include any app/tool name or prefix in the output.
 - If git activity is visible, the description should reflect it (e.g., reviewing changes), but do not add 'git_'."""
 
+metadata_summary = "\n".join(
+    line
+    for line in [
+        f"pane_current_command: {pane_cmd}" if pane_cmd else "",
+        f"window_name: {window_name}" if window_name else "",
+        f"pane_title: {pane_title}" if pane_title else "",
+        f"pane_mode: {pane_mode}" if pane_mode else "",
+        f"alternate_screen_active: {alternate_on}",
+        f"mouse_mode_active: {mouse_any_flag}",
+        f"likely_tui_app: {is_tui}",
+    ]
+    if line
+)
+
 prompt = f"""Analyze this terminal session and create a descriptive tmux session name based on what the user actually did.
 
 Terminal output (last capture):
 {content}
 
+Tmux metadata (use as supporting hints, not as the primary source of truth):
+{metadata_summary}
+
 Extracted command history (oldest to newest):
 {command_history}
 
@@ -1460,6 +1564,8 @@ Focus: produce a concise description of the activity. Follow these rules:
 
 {'No clear prompt/command lines were detected. Rely on the terminal output context.' if not commands_detected else ''}
 
+{'An interactive TUI is likely running. Prefer the visible screen content plus recent command history over generic app names.' if is_tui.lower() in {'1', 'true', 'yes', 'on'} else ''}
+
 {'First 10 lines of terminal output (useful for identifying running app/service):\n' + first_ten_lines if not commands_detected and first_ten_lines else ''}
 
 If no commands were detected, fall back to terminal output analysis but describe the main activity in the name. Identify the dominant application or process implied by the output (e.g., web server, test runner, build tool).
@@ -1545,7 +1651,18 @@ PYCODE
   if [[ -z "$request_body" ]]; then
     # Fallback: base64 encode the content to avoid escaping issues
     local encoded_content
-    encoded_content=$(base64 < "$temp_file" | tr -d '\n')
+    local fallback_file
+    if [[ "$OSTYPE" == "darwin"* ]]; then
+      fallback_file=$(mktemp -t gw_fb)
+    else
+      fallback_file=$(mktemp)
+    fi
+    {
+      printf '%b\n\n' "$metadata_block"
+      cat "$temp_file"
+    } > "$fallback_file"
+    encoded_content=$(base64 < "$fallback_file" | tr -d '\n')
+    rm -f "$fallback_file"
     if [[ "$provider" == "openai" ]]; then
       request_body=$(cat <<EOF
 {
@@ -1555,7 +1672,7 @@ PYCODE
   "messages": [
     {
       "role": "user",
-      "content": "I'll send you base64-encoded terminal output. Please decode it, analyze it, and create a descriptive name for this tmux session.\n\nIMPORTANT: Ignore any window titles or metadata. Focus ONLY on the actual terminal content.\n\nCRITICAL: Check for Git patterns FIRST:\n- Git commands: git status, diff, add, commit, push, pull, checkout, branch, merge, rebase, log, stash\n- Git output: 'On branch', 'Changes not staged', 'modified:', 'new file:', diff output (+/-/@@), commit hashes\n- If ANY Git patterns found, the description should reflect git activity (but do not add 'git_').\n\nDESCRIPTION ONLY: Return a short description of the activity.\n- Do NOT include the app/tool name or any prefix in the output.\n\nUse underscores only. Max 100 chars total.\n\nExamples:\n- reviewing_changes_before_commit\n- resolving_merge_conflicts\n- fixing_auth_bug\n- running_nextjs_dev_server\n\nBase64 terminal output:\n${encoded_content}\n\nRespond with ONLY the session name, nothing else."
+      "content": "I'll send you base64-encoded terminal output. Please decode it, analyze it, and create a descriptive name for this tmux session.\n\nIMPORTANT: Use terminal metadata only as supporting hints. Prioritize the visible terminal content and recent command history.\n\nCRITICAL: Check for Git patterns FIRST:\n- Git commands: git status, diff, add, commit, push, pull, checkout, branch, merge, rebase, log, stash\n- Git output: 'On branch', 'Changes not staged', 'modified:', 'new file:', diff output (+/-/@@), commit hashes\n- If ANY Git patterns found, the description should reflect git activity (but do not add 'git_').\n\nDESCRIPTION ONLY: Return a short description of the activity.\n- Do NOT include the app/tool name or any prefix in the output.\n\nUse underscores only. Max 100 chars total.\n\nExamples:\n- reviewing_changes_before_commit\n- resolving_merge_conflicts\n- fixing_auth_bug\n- running_nextjs_dev_server\n\nBase64 terminal output:\n${encoded_content}\n\nRespond with ONLY the session name, nothing else."
     }
   ]
 }
@@ -1569,7 +1686,7 @@ EOF
   "messages": [
     {
       "role": "user",
-      "content": "I'll send you base64-encoded terminal output. Please decode it, analyze it, and create a descriptive name for this tmux session.\n\nIMPORTANT: Ignore any window titles or metadata. Focus ONLY on the actual terminal content.\n\nCRITICAL: Check for Git patterns FIRST:\n- Git commands: git status, diff, add, commit, push, pull, checkout, branch, merge, rebase, log, stash\n- Git output: 'On branch', 'Changes not staged', 'modified:', 'new file:', diff output (+/-/@@), commit hashes\n- If ANY Git patterns found, the description should reflect git activity (but do not add 'git_').\n\nDESCRIPTION ONLY: Return a short description of the activity.\n- Do NOT include the app/tool name or any prefix in the output.\n\nUse underscores only. Max 100 chars total.\n\nExamples:\n- reviewing_changes_before_commit\n- resolving_merge_conflicts\n- fixing_auth_bug\n- running_nextjs_dev_server\n\nBase64 terminal output:\n${encoded_content}\n\nRespond with ONLY the session name, nothing else."
+      "content": "I'll send you base64-encoded terminal output. Please decode it, analyze it, and create a descriptive name for this tmux session.\n\nIMPORTANT: Use terminal metadata only as supporting hints. Prioritize the visible terminal content and recent command history.\n\nCRITICAL: Check for Git patterns FIRST:\n- Git commands: git status, diff, add, commit, push, pull, checkout, branch, merge, rebase, log, stash\n- Git output: 'On branch', 'Changes not staged', 'modified:', 'new file:', diff output (+/-/@@), commit hashes\n- If ANY Git patterns found, the description should reflect git activity (but do not add 'git_').\n\nDESCRIPTION ONLY: Return a short description of the activity.\n- Do NOT include the app/tool name or any prefix in the output.\n\nUse underscores only. Max 100 chars total.\n\nExamples:\n- reviewing_changes_before_commit\n- resolving_merge_conflicts\n- fixing_auth_bug\n- running_nextjs_dev_server\n\nBase64 terminal output:\n${encoded_content}\n\nRespond with ONLY the session name, nothing else."
     }
   ]
 }
@@ -1591,6 +1708,7 @@ EOF
       context_file=$(mktemp)
     fi
     {
+      printf '%b\n\n' "$metadata_block"
       printf 'TMUX SESSION CAPTURE\n\n'
       cat "$temp_file"
       if [[ -n "$history_arg" && -f "$history_arg" ]]; then

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

@@ -191,11 +191,18 @@ bridge_rename_session() {
   fi
   original_session_name="$1"
 
+  clear_auto_rename_requested() {
+    if tmux_available && tmux_session_exists "$original_session_name"; then
+      tmux set-option -qu -t "$original_session_name" @orchestra_auto_rename_requested >/dev/null 2>&1 || true
+    fi
+  }
+
   # Load API key from config file or fallback to .env
   load_openai_api_key
   load_anthropic_api_key
 
   if [[ -z "${OPENAI_API_KEY-}" && -z "${ANTHROPIC_API_KEY-}" ]]; then
+    clear_auto_rename_requested
     echo "\"missing_api_key\""
     return 0
   fi
@@ -234,6 +241,7 @@ bridge_rename_session() {
     ai_name="$(echo "$ai_name" | tr ' ' '_' | sed 's/[^a-zA-Z0-9_-]//g' | cut -c1-100)"
     ai_name="$(echo "$ai_name" | sed 's/^_*//')"
     if [[ -z "$ai_name" ]]; then
+      clear_auto_rename_requested
       echo "\"ai_generation_failed\""
       return 0
     fi
@@ -251,10 +259,12 @@ bridge_rename_session() {
         echo "\"success\""
       fi
     else
+      clear_auto_rename_requested
       echo "\"rename_failed\""
     fi
   else
     # AI generation failed, keep original name
+    clear_auto_rename_requested
     if [[ -n "$ai_err" ]]; then
       echo "\"ai_generation_failed: ${ai_err}\""
     elif [[ $ai_status -ne 0 ]]; then

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

@@ -125,12 +125,32 @@ bridge_session_metadata() {
     window_name=$(tmux display-message -t "$session_name" -p '#{window_name}' 2>/dev/null || echo "")
     pane_title=$(tmux display-message -t "$session_name" -p '#{pane_title}' 2>/dev/null || echo "")
     pane_cmd=$(tmux display-message -t "$session_name" -p '#{pane_current_command}' 2>/dev/null || echo "")
-    
+    pane_mode=$(tmux display-message -t "$session_name" -p '#{pane_mode}' 2>/dev/null || echo "")
+    alternate_on=$(tmux display-message -t "$session_name" -p '#{alternate_on}' 2>/dev/null || echo "0")
+    mouse_any_flag=$(tmux display-message -t "$session_name" -p '#{mouse_any_flag}' 2>/dev/null || echo "0")
+    auto_rename_requested=$(tmux show-options -qv -t "$session_name" @orchestra_auto_rename_requested 2>/dev/null || echo "")
+    case "$(printf '%s' "$alternate_on" | tr '[:upper:]' '[:lower:]')" in
+      1|yes|true|on) alternate_on=true ;;
+      *) alternate_on=false ;;
+    esac
+    case "$(printf '%s' "$mouse_any_flag" | tr '[:upper:]' '[:lower:]')" in
+      1|yes|true|on) mouse_any_flag=true ;;
+      *) mouse_any_flag=false ;;
+    esac
+    case "$(printf '%s' "$auto_rename_requested" | tr '[:upper:]' '[:lower:]')" in
+      1|yes|true|on) auto_rename_requested=true ;;
+      *) auto_rename_requested=false ;;
+    esac
+
     # Return JSON with metadata
     json_object \
       "window_name:s=$window_name" \
       "pane_title:s=$pane_title" \
-      "current_command:s=$pane_cmd"
+      "current_command:s=$pane_cmd" \
+      "pane_mode:s=$pane_mode" \
+      "alternate_on:b=$alternate_on" \
+      "mouse_any_flag:b=$mouse_any_flag" \
+      "auto_rename_requested:b=$auto_rename_requested"
   else
     json_error "tmux not available"
   fi

package/resources/scripts/shell/orchestra-command-hook.sh

@@ -18,6 +18,8 @@ fi
 ORCHESTRA_HISTORY_DIR="${ORCHESTRA_HISTORY_DIR:-$HOME/.orchestra/history}"
 ORCHESTRA_PROMPT_HOOK_INSTALLED=1
 
+_ORCHESTRA_HOOK_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd -P)"
+
 _orchestra_history_key() {
   local key="$1"
   key="${key//\//_}"
@@ -31,6 +33,101 @@ _orchestra_history_key() {
   echo "$key"
 }
 
+_orchestra_bridge_path() {
+  local bridge=""
+
+  if [[ -n "${GW_ORCHESTRATOR_ROOT-}" ]]; then
+    bridge="$GW_ORCHESTRATOR_ROOT/gw-bridge.sh"
+    if [[ -f "$bridge" ]]; then
+      echo "$bridge"
+      return
+    fi
+  fi
+
+  bridge="$(cd "$_ORCHESTRA_HOOK_DIR/.." && pwd -P)/gw-bridge.sh"
+  if [[ -f "$bridge" ]]; then
+    echo "$bridge"
+    return
+  fi
+
+  echo ""
+}
+
+_orchestra_should_auto_rename_session() {
+  local session_name="$1"
+  [[ -n "$session_name" && "$session_name" == *"__auto_"* ]]
+}
+
+_orchestra_should_trigger_auto_rename_command() {
+  local command="$1"
+  local app="$2"
+
+  [[ -n "$command" ]] || return 1
+
+  case "$app" in
+    ""|cd|ls|pwd|clear|reset)
+      return 1
+      ;;
+  esac
+
+  return 0
+}
+
+_orchestra_auto_rename_flag_path() {
+  local session_name="$1"
+  local session_key
+  session_key=$(_orchestra_history_key "$session_name")
+  if [[ -z "$session_key" ]]; then
+    return
+  fi
+  printf '%s/%s.rename_requested\n' "$ORCHESTRA_HISTORY_DIR" "$session_key"
+}
+
+_orchestra_auto_rename_delay_secs() {
+  local delay="${ORCHESTRA_AUTO_RENAME_DELAY_SECS:-10}"
+  if [[ ! "$delay" =~ ^[0-9]+([.][0-9]+)?$ ]]; then
+    delay="10"
+  fi
+  printf '%s\n' "$delay"
+}
+
+_orchestra_trigger_auto_rename_async() {
+  local session_name="$1"
+  local command="$2"
+  local app="$3"
+
+  [[ -n "$session_name" ]] || return
+  _orchestra_should_auto_rename_session "$session_name" || return
+  _orchestra_should_trigger_auto_rename_command "$command" "$app" || return
+
+  local bridge
+  bridge="$(_orchestra_bridge_path)"
+  [[ -n "$bridge" && -f "$bridge" ]] || return
+
+  local flag_path
+  flag_path="$(_orchestra_auto_rename_flag_path "$session_name")"
+  [[ -n "$flag_path" ]] || return
+  if [[ -f "$flag_path" ]]; then
+    return
+  fi
+
+  local timestamp
+  timestamp=$(date '+%Y-%m-%dT%H:%M:%S%z')
+  printf '%s\n' "$timestamp" > "$flag_path"
+
+  if command -v tmux >/dev/null 2>&1; then
+    tmux set-option -q -t "$session_name" @orchestra_auto_rename_requested 1 >/dev/null 2>&1 || true
+  fi
+
+  local delay
+  delay="$(_orchestra_auto_rename_delay_secs)"
+
+  (
+    sleep "$delay"
+    command bash "$bridge" rename-session "$session_name" >/dev/null 2>&1 || true
+  ) >/dev/null 2>&1 &
+}
+
 _orchestra_capture_command() {
   local cmd=""
   if [[ -n "${ZSH_VERSION-}" ]]; then
@@ -171,6 +268,10 @@ orchestra_log_command() {
     printf '%s\n' "$app" > "$ORCHESTRA_HISTORY_DIR/$key.last_app"
   fi
   printf '%s\n' "$command" > "$ORCHESTRA_HISTORY_DIR/$key.last_cmd"
+
+  if [[ -n "$session_name" && "$session_name" != "shell" ]]; then
+    _orchestra_trigger_auto_rename_async "$session_name" "$command" "$app" || true
+  fi
 }
 
 _orchestra_install_hook_bash() {