@humanu/orchestra 0.5.65 → 0.5.69

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@humanu/orchestra",
-  "version": "0.5.65",
+  "version": "0.5.69",
   "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=""
@@ -145,6 +196,10 @@ _orchestra_command_hook() {
   echo ""
 }
 
+_orchestra_bridge_script() {
+  echo "$(dirname "$_TMUX_API_DIR")/gw-bridge.sh"
+}
+
 # Source the command hook inside a tmux session to enable command history logging
 _tmux_source_command_hook() {
   local session="$1"
@@ -156,6 +211,8 @@ _tmux_source_command_hook() {
   if ! tmux_session_exists "$session"; then
     return
   fi
+  local bridge
+  bridge="$(_orchestra_bridge_script)"
   local panes
   panes=$(tmux list-panes -t "$session" -F '#{pane_id} #{pane_current_command}' 2>/dev/null || echo "")
   if [[ -z "$panes" ]]; then
@@ -168,7 +225,7 @@ _tmux_source_command_hook() {
     pane_cmd="${line#* }"
     case "$pane_cmd" in
       bash|zsh)
-        tmux send-keys -t "$pane_id" ". '$hook'" C-m 2>/dev/null || true
+        tmux send-keys -t "$pane_id" "export ORCHESTRA_BRIDGE_PATH='$bridge'; . '$hook'" C-m 2>/dev/null || true
         ;;
       *)
         ;;
@@ -179,6 +236,51 @@ _tmux_source_command_hook() {
 # Helper: orchestra prefix including delimiter
 _tmux_orch_prefix() { printf "orchestra%s" "$( _tmux_delim )"; }
 
+_tmux_status_escape_text() {
+  local text="$1"
+  text="${text//\#/##}"
+  printf '%s' "$text"
+}
+
+_tmux_orchestra_status_left() {
+  local worktree_name="$1"
+  local session_display_name="$2"
+  worktree_name="$(_tmux_status_escape_text "$worktree_name")"
+  session_display_name="$(_tmux_status_escape_text "$session_display_name")"
+  printf '#[fg=white,bg=colour22,bold] %s #[default] Rename: Ctrl+b,r | Go back (detach): Ctrl+b,d | Copy (scroll) mode: Ctrl+b,[ | Worktree: %s' "$session_display_name" "$worktree_name"
+}
+
+_tmux_configure_orchestra_bindings() {
+  local bridge
+  bridge="$(_orchestra_bridge_script)"
+  [[ -f "$bridge" ]] || return
+
+  local quoted_bridge rename_command prompt_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\"'"
+
+  tmux bind-key -T prefix r if-shell -F '#{@orchestra_display_name}' \
+    "$prompt_command" 'refresh-client -S' >/dev/null 2>&1 || true
+}
+
+_tmux_configure_orchestra_status() {
+  local session_name="$1"
+  local worktree_name="$2"
+  local session_display_name="${3:-}"
+  local status_left
+  if [[ -z "$session_display_name" ]]; then
+    session_display_name="$(tmux_format_session_display "$session_name" without-timestamp)"
+  fi
+  status_left="$(_tmux_orchestra_status_left "$worktree_name" "$session_display_name")"
+
+  tmux set-option -t "$session_name" @orchestra_display_name "$session_display_name" >/dev/null 2>&1 || true
+  tmux set-option -t "$session_name" @orchestra_worktree_name "$worktree_name" >/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 220 >/dev/null 2>&1 || true
+  _tmux_configure_orchestra_bindings
+}
+
 # Helper: split a string by multi-char delimiter into bash array named by ref
 # Usage: _tmux_split_by_delim "string" "::" out_array_name
 _tmux_split_by_delim() {
@@ -289,10 +391,7 @@ tmux_create_session() {
     else
       worktree_name="$(basename "$working_dir")"
     fi
-    tmux set-option -t "$session_name" status-left "Go back (detach): Ctrl+b,d | Copy (scroll) mode: Ctrl+b,[ | Worktree: ${worktree_name}" >/dev/null 2>&1 || true
-    
-    # Increase status-left length to accommodate the message
-    tmux set-option -t "$session_name" status-left-length 120 >/dev/null 2>&1 || true
+    _tmux_configure_orchestra_status "$session_name" "$worktree_name"
   fi
   
   echo "$session_name"
@@ -432,8 +531,7 @@ tmux_attach_session() {
       worktree_name="$branch_name"
     fi
   fi
-  tmux set-option -t "$sess" status-left "Go back (detach): Ctrl+b,d | Copy (scroll) mode: Ctrl+b,[ | Worktree: ${worktree_name}" >/dev/null 2>&1 || true
-  tmux set-option -t "$sess" status-left-length 120 >/dev/null 2>&1 || true
+  _tmux_configure_orchestra_status "$sess" "$worktree_name"
   
   if tmux_inside_session; then
     tmux switch-client -t "$sess" >/dev/null 2>&1 || true
@@ -511,6 +609,24 @@ tmux_rename_session() {
     err "Failed to rename session"
     return 1
   }
+  local worktree_name
+  worktree_name="$(tmux show-option -t "$new_session" -qv @orchestra_worktree_name 2>/dev/null || true)"
+  if [[ -z "$worktree_name" ]]; then
+    local session_dir old_pwd branch_name
+    session_dir="$(tmux display-message -t "$new_session" -p '#{pane_current_path}' 2>/dev/null || echo "")"
+    if [[ -n "$session_dir" && -d "$session_dir" ]]; then
+      old_pwd="$PWD"
+      cd "$session_dir" 2>/dev/null || true
+      branch_name="$(git rev-parse --abbrev-ref HEAD 2>/dev/null || echo "")"
+      cd "$old_pwd" 2>/dev/null || true
+      if [[ -n "$branch_name" && "$branch_name" != "detached" ]]; then
+        worktree_name="$branch_name"
+      else
+        worktree_name="$(basename "$session_dir")"
+      fi
+    fi
+  fi
+  _tmux_configure_orchestra_status "$new_session" "$worktree_name"
   >&2 echo "✏️  Renamed session to: $new_name"
   return 0
 }
@@ -595,66 +711,119 @@ tmux_find_session() {
 
 # Helper function to format session display names
 # Input: session_content (e.g., "opencode_fixing_auth_bug" or "my_feature_work")
-# Output: "Opencode: Fixing Auth Bug" or "My Feature Work"
+# Output: "Opencode Fixing Auth Bug" or "My Feature Work"
 format_session_display_name() {
   local session_content="$1"
-  
-  # Known app prefixes and their display names
-  local known_apps=("opencode" "running" "ssh" "docker" "k8s" "git" "db")
-  local app_prefix=""
-  local description=""
-  
-  # Check if session starts with a known app prefix
-  for app in "${known_apps[@]}"; do
-    if [[ "$session_content" =~ ^${app}_ ]]; then
-      app_prefix="$app"
-      # Remove the app prefix and following underscore
-      description="${session_content#${app}_}"
-      break
-    fi
-  done
-  
-  # If no app prefix found, treat whole string as description
-  if [[ -z "$app_prefix" ]]; then
-    description="$session_content"
+  local d
+  d="$(_tmux_delim)"
+  local ORCH_PREFIX
+  ORCH_PREFIX="$(_tmux_orch_prefix)"
+  if [[ "$session_content" == ${ORCH_PREFIX}* ]]; then
+    session_content="${session_content#${ORCH_PREFIX}}"
   fi
-  
-  # Convert underscores and hyphens to spaces and apply sentence case
-  description="$(echo "$description" | tr '_-' ' ')"
-  
-  # Apply sentence case (capitalize first letter of each word)
+  if [[ "$session_content" == auto_* ]]; then
+    session_content="${session_content#auto_}"
+  fi
+  local description
+  description="$(echo "$session_content" | tr '_-' ' ')"
   description="$(echo "$description" | awk '{for(i=1;i<=NF;i++) $i=toupper(substr($i,1,1)) tolower(substr($i,2));}1')"
-  
-  # Format final display name
-  if [[ -n "$app_prefix" ]]; then
-    # Capitalize app name and format as "App: Description"
-    local app_display="$(echo "$app_prefix" | awk '{print toupper(substr($1,1,1)) tolower(substr($1,2))}')"
-    echo "${app_display}: ${description}"
-  else
-    echo "$description"
+  echo "$description"
+}
+
+_tmux_format_session_timestamp() {
+  local date_part="$1"
+  local time_part="$2"
+
+  if [[ ! "$date_part" =~ ^[0-9]{8}$ || ! "$time_part" =~ ^[0-9]{6}$ ]]; then
+    printf '%s %s\n' "$date_part" "$time_part"
+    return
+  fi
+
+  local month day hour minute ampm display_hour
+  month=$((10#${date_part:4:2}))
+  day=$((10#${date_part:6:2}))
+  hour=$((10#${time_part:0:2}))
+  minute="${time_part:2:2}"
+
+  ampm="am"
+  display_hour="$hour"
+  if (( hour >= 12 )); then
+    ampm="pm"
+    if (( hour > 12 )); then
+      display_hour=$((hour - 12))
+    fi
   fi
+  if (( hour == 0 )); then
+    display_hour=12
+  fi
+
+  local month_names=("" "Jan" "Feb" "Mar" "Apr" "May" "Jun" "Jul" "Aug" "Sep" "Oct" "Nov" "Dec")
+  local month_name="???"
+  if (( month > 0 && month <= 12 )); then
+    month_name="${month_names[$month]}"
+  fi
+
+  printf '%s %s %s:%s%s\n' "$month_name" "$day" "$display_hour" "$minute" "$ampm"
 }
 
 # Parse session name and format for display
 # Input: session_name (format: worktreename_repohash_YYYYMMDD_HHMMSS_readable_name or old formats)
-# Output: "App: Description" or formatted display name
+# Output: formatted display name
 # Usage: tmux_format_session_display <session_name>
 tmux_format_session_display() {
   local session_name="$1"
-  
+  local timestamp_mode="${2:-with-timestamp}"
+
   # Handle temporary renaming sessions first
   if [[ "$session_name" =~ _renaming$ ]]; then
     # Extract base name before _renaming suffix
     local base_name="${session_name%_renaming}"
     # Recursively process the base name to get proper display
-    tmux_format_session_display "$base_name"
+    tmux_format_session_display "$base_name" "$timestamp_mode"
     return $?
   fi
   
-  # Strip leading orchestra_ prefix if present
-  if [[ "$session_name" =~ ^orchestra_(.+)$ ]]; then
+  local d ORCH_PREFIX
+  d="$(_tmux_delim)"
+  ORCH_PREFIX="$(_tmux_orch_prefix)"
+
+  if [[ "$session_name" == ${ORCH_PREFIX}* ]]; then
+    session_name="${session_name#${ORCH_PREFIX}}"
+  elif [[ "$session_name" =~ ^orchestra_(.+)$ ]]; then
     session_name="${BASH_REMATCH[1]}"
   fi
+
+  local parts
+  _tmux_split_by_delim "$session_name" "$d" parts
+  local idx_time=-1 idx_date=-1 i
+  for (( i=${#parts[@]}-1; i>=0; i-- )); do
+    if [[ ${parts[$i]} =~ ^[0-9]{6}$ ]] && (( i > 0 )) && [[ ${parts[$((i-1))]} =~ ^[0-9]{8}$ ]]; then
+      idx_time=$i
+      idx_date=$((i-1))
+      break
+    fi
+  done
+  if (( idx_time >= 0 && idx_date >= 0 )); then
+    local readable_name=""
+    local j
+    for (( j=idx_time+1; j<${#parts[@]}; j++ )); do
+      if [[ -n "$readable_name" ]]; then
+        readable_name+="$d"
+      fi
+      readable_name+="${parts[$j]}"
+    done
+    if [[ -n "$readable_name" ]]; then
+      local formatted_name timestamp
+      formatted_name="$(format_session_display_name "$readable_name")"
+      timestamp="$(_tmux_format_session_timestamp "${parts[$idx_date]}" "${parts[$idx_time]}")"
+      if [[ "$timestamp_mode" == "without-timestamp" ]]; then
+        echo "$formatted_name"
+      else
+        echo "${formatted_name} (${timestamp})"
+      fi
+      return 0
+    fi
+  fi
   
   # New format with repo hash: worktreename_repohash_YYYYMMDD_HHMMSS_readable_name
   if [[ "$session_name" =~ ^[^_]+_[a-f0-9]{8}_([0-9]{8})_([0-9]{6})_(.+)$ ]]; then
@@ -696,13 +865,17 @@ tmux_format_session_display() {
     
     # Format the readable name with proper formatting
     local formatted_name="$(format_session_display_name "$readable_name")"
-    
-    echo "${formatted_name} (${month_name} ${display_day} ${display_hour}:${minute}${ampm})"
+
+    if [[ "$timestamp_mode" == "without-timestamp" ]]; then
+      echo "$formatted_name"
+    else
+      echo "${formatted_name} (${month_name} ${display_day} ${display_hour}:${minute}${ampm})"
+    fi
   # Fallback: Try format without repo hash: appname_description_YYYYMMDD_HHMMSS
   elif [[ "$session_name" =~ ^(.*)_[0-9]{8}_[0-9]{6}$ ]]; then
     local session_content="${BASH_REMATCH[1]}"  # appname_description
     
-    # Convert to proper display format with app prefix
+    # Convert to proper display format
     local formatted_name="$(format_session_display_name "$session_content")"
     echo "$formatted_name"
   else
@@ -746,8 +919,12 @@ tmux_format_session_display() {
       
       # Format the readable name with proper formatting
       local formatted_name="$(format_session_display_name "$readable_name")"
-      
-      echo "${formatted_name} (${month_name} ${display_day} ${display_hour}:${minute}${ampm})"
+
+      if [[ "$timestamp_mode" == "without-timestamp" ]]; then
+        echo "$formatted_name"
+      else
+        echo "${formatted_name} (${month_name} ${display_day} ${display_hour}:${minute}${ampm})"
+      fi
     else
       # Fallback for sessions that don't match either format
       echo "$session_name"
@@ -1045,7 +1222,6 @@ NODE
 # Usage: tmux_generate_ai_session_name <session_name>
 tmux_generate_ai_session_name() {
   local session="$1"
-  TMUX_AI_APP_SOURCE=""
   
   # Load AI provider config and API keys
   tmux_load_ai_primary_provider
@@ -1077,20 +1253,17 @@ 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=""
   local history_dir="${ORCHESTRA_HISTORY_DIR:-$HOME/.orchestra/history}"
-  local app_prefix=""
   local pane_id
   pane_id="$(tmux display-message -t "$session" -p '#{pane_id}' 2>/dev/null || echo "")"
   local pane_key=""
@@ -1100,18 +1273,25 @@ tmux_generate_ai_session_name() {
   local session_key
   session_key="$(_orchestra_history_key "$session")"
 
-  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"
-  elif [[ -n "$session_key" && -f "$history_dir/$session_key.last_app" ]]; then
-    app_source_path="$history_dir/$session_key.last_app"
-  fi
-  if [[ -n "$app_source_path" ]]; then
-    IFS= read -r app_prefix < "$app_source_path" || true
+  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
 
-  if [[ -z "$app_prefix" ]]; then
-    app_prefix="$(_tmux_normalize_app_from_command "$pane_cmd")"
+  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 history_path=""
@@ -1131,6 +1311,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)"
@@ -1153,11 +1343,10 @@ tmux_generate_ai_session_name() {
   
   # Prepare the API request using Python for proper JSON encoding
   local request_body=""
-  local preloaded_app_prefix="$app_prefix"
   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,11 +1357,17 @@ 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
 fallback_candidates = []  # All prompt-like lines (used if we fail to classify)
-app_command_candidates = []  # Command-only strings for app prefix
 
 history_commands = []
 if history_arg:
@@ -1380,7 +1575,6 @@ for raw_line in lines:
     normalized_command = " ".join(tokens)
     formatted_line = f"{prompt_part}:{normalized_command}"
     fallback_candidates.append(formatted_line)
-    app_command_candidates.append(normalized_command)
 
     allowed = (
         first_token in common_commands
@@ -1444,11 +1638,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 +1671,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).
@@ -1496,56 +1709,26 @@ else:
         ]
     }
 
-def normalize_app(cmd: str) -> str:
-    cmd = cmd.strip()
-    if not cmd:
-        return ""
-    for lead in ("$ ", "> "):
-        if cmd.startswith(lead):
-            cmd = cmd[len(lead):].strip()
-    parts = cmd.split()
-    if not parts:
-        return ""
-    if parts[0] in ("sudo", "env", "command"):
-        parts = parts[1:]
-    if not parts:
-        return ""
-    base = parts[0].split("/")[-1].lower()
-    base = re.sub(r"[^a-z0-9]+", "_", base).strip("_")
-    if base in {"bash", "zsh", "sh", "fish", "tmux", "login", "sudo", "man", "less", "more", "cat", "tail", "watch", "source", "export", "set", "alias", "unalias", "history", "bindkey"}:
-        return ""
-    return base
-
-app_commands = history_commands if history_commands else app_command_candidates
-app_prefix = ""
-for candidate in reversed(app_commands):
-    app_prefix = normalize_app(candidate)
-    if app_prefix:
-        break
-
-print(app_prefix)
 print(json.dumps(request))
 PYCODE
     )
-    local parsed_app_prefix
-    parsed_app_prefix="${request_payload%%$'\n'*}"
-    request_body="${request_payload#*$'\n'}"
-    if [[ -n "$preloaded_app_prefix" ]]; then
-      app_prefix="$preloaded_app_prefix"
-    else
-      app_prefix="$parsed_app_prefix"
-    fi
-    if [[ "$request_body" == "$request_payload" ]]; then
-      request_body="$request_payload"
-      if [[ -z "$preloaded_app_prefix" ]]; then
-        app_prefix=""
-      fi
-    fi
+    request_body="$request_payload"
   fi
   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 +1738,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 +1752,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 +1774,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
@@ -1782,17 +1966,6 @@ print(description)' <<<"$responses_resp" 2>/dev/null || true)"
     return 1
   fi
 
-  app_prefix=$(printf '%s' "$app_prefix" | tr '[:upper:]' '[:lower:]' | tr -c 'a-z0-9' '_')
-  app_prefix="${app_prefix//__/_}"
-  app_prefix="${app_prefix##_}"
-  app_prefix="${app_prefix%%_}"
-  TMUX_AI_APP_SOURCE="$app_prefix"
-  if [[ -n "$app_prefix" ]]; then
-    if [[ "$new_name" == "${app_prefix}_"* ]]; then
-      new_name="${new_name#${app_prefix}_}"
-    fi
-    new_name="${app_prefix}_${new_name}"
-  fi
   new_name="${new_name:0:100}"
   
   echo "$new_name"

package/resources/scripts/gw-bridge.sh

@@ -107,7 +107,7 @@ case "${1:-}" in
     ;;
   
   "tmux-send-keys")
-    bridge_tmux_send_keys "${2:-}" "$@"
+    bridge_tmux_send_keys "${2:-}" "${@:3}"
     ;;
     
   "session-metadata")
@@ -127,7 +127,7 @@ case "${1:-}" in
     ;;
     
   "manual-rename-session")
-    bridge_manual_rename_session "${2:-}" "${3:-}"
+    bridge_manual_rename_session "${2:-}" "${@:3}"
     ;;
     
   "check-branch")

package/resources/scripts/orchestra-local.sh

@@ -77,6 +77,10 @@ main() {
     exit 1
   fi
 
+  # This launcher is explicitly for local development; ignore installed binary
+  # overrides so gwr.sh resolves the TUI binary from the selected checkout.
+  unset GW_TUI_BIN
+
   if [[ ${#args[@]} -gt 0 ]]; then
     exec bash "$script_path" "${args[@]}"
   else

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

@@ -65,26 +65,6 @@ def extract_command(line: str) -> str:
             return line.split(marker)[-1].strip()
     return ""
 
-def normalize_app(cmd: str) -> str:
-    cmd = cmd.strip()
-    if not cmd:
-        return ""
-    for lead in ("$ ", "> "):
-        if cmd.startswith(lead):
-            cmd = cmd[len(lead):].strip()
-    parts = cmd.split()
-    if not parts:
-        return ""
-    if parts[0] in ("sudo", "env", "command"):
-        parts = parts[1:]
-    if not parts:
-        return ""
-    base = parts[0].split("/")[-1].lower()
-    base = re.sub(r"[^a-z0-9]+", "_", base).strip("_")
-    if base in {"bash", "zsh", "sh", "fish", "tmux", "login", "sudo", "man", "less", "more", "cat", "tail", "watch", "source", "export", "set", "alias", "unalias", "history", "bindkey"}:
-        return ""
-    return base
-
 lines = content.splitlines()
 last_cmd = ""
 for line in reversed(lines):
@@ -93,7 +73,6 @@ for line in reversed(lines):
         last_cmd = candidate
         break
 
-app_prefix = normalize_app(last_cmd) or ""
 prompt = f"""Analyze this terminal session and create a descriptive name based ONLY on the console output and commands executed.
 
 Terminal output:
@@ -137,16 +116,10 @@ else:
         "max_tokens": 100,
         "messages": [{"role": "user", "content": prompt}],
     }
-print(app_prefix)
 print(json.dumps(req))
 PY
   )
-  app_prefix="${request_payload%%$'\n'*}"
-  request_body="${request_payload#*$'\n'}"
-  if [[ "$request_body" == "$request_payload" ]]; then
-    request_body="$request_payload"
-    app_prefix=""
-  fi
+  request_body="$request_payload"
   if [[ "$provider" == "openai" ]]; then
     response=$(curl -s -X POST https://api.openai.com/v1/chat/completions \
       --max-time 20 \
@@ -168,16 +141,6 @@ PY
   if [[ -z "$new_name" ]]; then
     echo "\"ai_generation_failed\""
   else
-    app_prefix="$(printf '%s' "$app_prefix" | tr '[:upper:]' '[:lower:]' | tr -c 'a-z0-9' '_')"
-    app_prefix="${app_prefix//__/_}"
-    app_prefix="${app_prefix##_}"
-    app_prefix="${app_prefix%%_}"
-    if [[ -n "$app_prefix" ]]; then
-      if [[ "$new_name" == "${app_prefix}_"* ]]; then
-        new_name="${new_name#${app_prefix}_}"
-      fi
-      new_name="${app_prefix}_${new_name}"
-    fi
     new_name="${new_name:0:100}"
     printf '"%s"\n' "$new_name"
   fi
@@ -191,11 +154,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
@@ -212,7 +182,6 @@ bridge_rename_session() {
   fi
 
   # Generate AI description using the CURRENT session (no renaming to temp name)
-  TMUX_AI_APP_SOURCE=""
   local err_file
   if [[ "$OSTYPE" == "darwin"* ]]; then
     err_file=$(mktemp -t gw_ai_err)
@@ -234,27 +203,21 @@ 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
 
     # Perform the rename preserving canonical prefix and delimiter
     if tmux_rename_session "$original_session_name" "$ai_name" >/dev/null; then
-      local app_source="${TMUX_AI_APP_SOURCE-}"
-      app_source="$(printf '%s' "$app_source" | tr '[:upper:]' '[:lower:]' | tr -c 'a-z0-9' '_')"
-      app_source="${app_source//__/_}"
-      app_source="${app_source##_}"
-      app_source="${app_source%%_}"
-      if [[ -n "$app_source" ]]; then
-        echo "\"success:app_source:${app_source}\""
-      else
-        echo "\"success\""
-      fi
+      echo "\"success\""
     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
@@ -267,12 +230,13 @@ bridge_rename_session() {
 
 # Manual rename session
 bridge_manual_rename_session() {
-  if [[ -z "${1:-}" ]] || [[ -z "${2:-}" ]]; then
+  if [[ -z "${1:-}" ]] || [[ $# -lt 2 ]]; then
     json_error "Old and new session names required"
     return 1
   fi
   old_name="$1"
-  new_display_name="$2"
+  shift
+  new_display_name="$*"
 
   if ! tmux_available; then
     echo "\"tmux_not_available\""
@@ -284,9 +248,10 @@ bridge_manual_rename_session() {
     echo "\"session_not_found\""
     return 0
   fi
+  new_display_name="$(printf '%s' "$new_display_name" | tr ' ' '_' | sed 's/[^a-zA-Z0-9_]/_/g' | cut -c1-100)"
 
-  # Validate new display name (alphanumeric, underscore, hyphen only)
-  if [[ ! "$new_display_name" =~ ^[a-zA-Z0-9_-]+$ ]]; then
+  # Validate new display name after matching the TUI's sanitization rules.
+  if [[ -z "$new_display_name" || ! "$new_display_name" =~ ^[a-zA-Z0-9_]+$ ]]; then
     echo "\"invalid_name\""
     return 0
   fi

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

@@ -103,7 +103,7 @@ bridge_tmux_send_keys() {
     json_error "Session name required"
     return 1
   fi
-  session_name="$1"; shift 2 || true
+  session_name="$1"; shift || true
   if tmux_available; then
     tmux_send_keys "$session_name" "$*" || { json_error "Failed to send keys"; return 1; }
     echo '{"ok":true}'
@@ -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/build/build_dependencies.sh

@@ -8,6 +8,16 @@ build_check_dependencies() {
     exit 1
   fi
 
+  if ! command -v cc >/dev/null 2>&1 && \
+     ! command -v clang >/dev/null 2>&1 && \
+     ! command -v gcc >/dev/null 2>&1; then
+    build_error "C compiler not found. Bundled SQLite requires a native C toolchain."
+    build_error "  macOS: xcode-select --install"
+    build_error "  Ubuntu/Debian: sudo apt install build-essential"
+    build_error "  RHEL/CentOS: sudo yum groupinstall 'Development Tools'"
+    exit 1
+  fi
+
   if ! command -v jq >/dev/null 2>&1; then
     build_warn "jq not found. Installing via package manager is recommended."
     build_warn "  macOS: brew install jq"

package/resources/scripts/shell/gwr_usage.sh

@@ -9,10 +9,12 @@ Usage: gwr [options]
 A terminal user interface for managing git worktrees and tmux sessions.
 
 Options:
-  -d, --debug     Enable debug mode
-  -h, --help      Show this help
-  --check-updates Check for available updates
-  --update        Check for available updates (alias for --check-updates)
+  -d, --debug      Enable debug mode
+  --new-tmux       Create and attach to a new tmux session for the current branch
+  --cmd <command>  Run a command in the new tmux session (repeatable; requires --new-tmux)
+  -h, --help       Show this help
+  --check-updates  Check for available updates
+  --update         Check for available updates (alias for --check-updates)
 
 Features:
   • Interactive worktree and session management
@@ -44,6 +46,8 @@ For the original shell-based interface, use: gw
 
 Examples:
   gwr             # Launch interactive TUI
+  gwr --new-tmux  # Start a new tmux session for the current branch
+  gwr --new-tmux --cmd "pnpm install" --cmd "pnpm dev"
   gwr --debug     # Launch with debug information
   gwr --help      # Show this help
   gwr --update    # Check for available updates

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

@@ -4,13 +4,62 @@
 #
 # Source this file from your shell profile to log each executed command to a
 # per-tmux-pane history file. The auto-rename pipeline can then use the
-# captured history as the primary signal for determining app prefixes.
+# captured history as the primary context for generating session names.
 #
 #   source /path/to/orchestrator/shell/orchestra-command-hook.sh
 #
 # On Bash we install a DEBUG pre-exec hook; on Zsh we install a preexec hook.
 # This captures the last user command reliably before execution.
 
+orchestra_rename_session() {
+  local new_name="$*"
+  if [[ -z "$new_name" ]]; then
+    printf 'Usage: orchestra_rename_session <new name>\n' >&2
+    return 1
+  fi
+
+  if [[ -z "${TMUX-}" ]] || ! command -v tmux >/dev/null 2>&1; then
+    printf 'orchestra_rename_session must be run inside a tmux session\n' >&2
+    return 1
+  fi
+
+  if [[ -z "${ORCHESTRA_BRIDGE_PATH-}" || ! -x "$ORCHESTRA_BRIDGE_PATH" ]]; then
+    printf 'ORCHESTRA_BRIDGE_PATH is not set or executable\n' >&2
+    return 1
+  fi
+
+  local session_name=""
+  session_name="$(tmux display-message -p '#{session_name}' 2>/dev/null || echo "")"
+  if [[ -z "$session_name" ]]; then
+    printf 'Unable to determine current tmux session\n' >&2
+    return 1
+  fi
+
+  local result=""
+  result="$("$ORCHESTRA_BRIDGE_PATH" manual-rename-session "$session_name" "$new_name" 2>/dev/null || true)"
+  case "$result" in
+    '"success"')
+      printf 'Renamed session to: %s\n' "$new_name"
+      ;;
+    '"invalid_name"')
+      printf 'Invalid session name: %s\n' "$new_name" >&2
+      return 1
+      ;;
+    '"session_not_found"')
+      printf 'Current tmux session was not found\n' >&2
+      return 1
+      ;;
+    '"tmux_not_available"')
+      printf 'tmux is not available\n' >&2
+      return 1
+      ;;
+    *)
+      printf 'Failed to rename session\n' >&2
+      return 1
+      ;;
+  esac
+}
+
 if [[ -n "${ORCHESTRA_PROMPT_HOOK_INSTALLED-}" ]]; then
   return 0 2>/dev/null || exit 0
 fi
@@ -18,6 +67,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 +82,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 +317,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() {

package/resources/scripts/shell/orchestra-local.sh

@@ -77,6 +77,10 @@ main() {
     exit 1
   fi
 
+  # This launcher is explicitly for local development; ignore installed binary
+  # overrides so gwr.sh resolves the TUI binary from the selected checkout.
+  unset GW_TUI_BIN
+
   if [[ ${#args[@]} -gt 0 ]]; then
     exec bash "$script_path" "${args[@]}"
   else