@humanu/orchestra 0.5.66 → 0.5.69

package/package.json

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

package/resources/api/tmux.sh

@@ -196,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"
@@ -207,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
@@ -219,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
         ;;
       *)
         ;;
@@ -230,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() {
@@ -340,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"
@@ -483,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
@@ -562,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
 }
@@ -646,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
@@ -747,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
@@ -797,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"
@@ -1096,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
@@ -1139,7 +1264,6 @@ tmux_generate_ai_session_name() {
   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=""
@@ -1170,20 +1294,6 @@ tmux_generate_ai_session_name() {
     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"
-  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
-  fi
-
-  if [[ -z "$app_prefix" ]]; then
-    app_prefix="$(_tmux_normalize_app_from_command "$pane_cmd")"
-  fi
-
   local history_path=""
   if [[ -n "$pane_key" && -f "$history_dir/$pane_key.log" ]]; then
     history_path="$history_dir/$pane_key.log"
@@ -1233,7 +1343,6 @@ 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=$(
@@ -1259,7 +1368,6 @@ 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:
@@ -1467,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
@@ -1602,51 +1709,10 @@ 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
@@ -1900,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
@@ -219,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)
@@ -248,16 +210,7 @@ bridge_rename_session() {
 
     # 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\""
@@ -277,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\""
@@ -294,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}'

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

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