@humanu/orchestra 0.5.58 → 0.5.59

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

@@ -3,14 +3,13 @@
 # Orchestra command history hook
 #
 # Source this file from your shell profile to log each executed command to a
-# per-tmux-session history file. The auto-rename pipeline can then use the
+# per-tmux-pane history file. The auto-rename pipeline can then use the
 # captured history as the primary signal for determining app prefixes.
 #
 #   source /path/to/orchestrator/shell/orchestra-command-hook.sh
 #
-# On Bash we automatically append the hook to PROMPT_COMMAND; on Zsh we add a
-# precmd hook (requires add-zsh-hook). Other shells can invoke
-# `orchestra_log_command` manually from their prompt hooks.
+# 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.
 
 if [[ -n "${ORCHESTRA_PROMPT_HOOK_INSTALLED-}" ]]; then
   return 0 2>/dev/null || exit 0
@@ -44,27 +43,118 @@ _orchestra_capture_command() {
   printf '%s' "$cmd"
 }
 
+_orchestra_normalize_app() {
+  local cmd="$1"
+  if [[ -n "${ZSH_VERSION-}" ]]; then
+    setopt local_options ksharrays 2>/dev/null || true
+  fi
+  cmd="${cmd#"${cmd%%[![:space:]]*}"}"
+  cmd="${cmd%"${cmd##*[![:space:]]}"}"
+  if [[ -z "$cmd" ]]; then
+    return
+  fi
+
+  local tokens=()
+  if [[ -n "${ZSH_VERSION-}" ]]; then
+    tokens=(${=cmd})
+  else
+    read -r -a tokens <<< "$cmd"
+  fi
+  if [[ ${#tokens[@]} -eq 0 ]]; then
+    return
+  fi
+
+  local i=0
+  while [[ $i -lt ${#tokens[@]} ]]; do
+    local t="${tokens[$i]}"
+    if [[ "$t" =~ ^[A-Za-z_][A-Za-z0-9_]*= ]]; then
+      ((i++))
+      continue
+    fi
+    case "$t" in
+      sudo|env|command|nohup|time)
+        ((i++))
+        continue
+        ;;
+    esac
+    break
+  done
+
+  if [[ $i -ge ${#tokens[@]} ]]; then
+    return
+  fi
+
+  local base="${tokens[$i]}"
+  base="${base##*/}"
+  base="$(printf '%s' "$base" | tr '[:upper:]' '[:lower:]' | tr -c 'a-z0-9._-:' '_')"
+  base="${base//__/_}"
+  base="${base##_}"
+  base="${base%%_}"
+
+  case "$base" in
+    python3|python3.*)
+      base="python"
+      ;;
+    pip3|pip3.*)
+      base="pip"
+      ;;
+    docker-compose|docker_compose)
+      base="docker_compose"
+      ;;
+    nvim|nvim.app)
+      base="nvim"
+      ;;
+  esac
+
+  case "$base" in
+    ""|bash|zsh|sh|fish|tmux|login|sudo|man|less|more|cat|tail|watch|source|export|set|alias|unalias|history|bindkey)
+      return
+      ;;
+  esac
+
+  printf '%s' "$base"
+}
+
 orchestra_log_command() {
-  local command=$(_orchestra_capture_command)
-  command="${command## }"
+  local command="${1-}"
+  if [[ -z "$command" ]]; then
+    command=$(_orchestra_capture_command)
+  fi
+  command="${command#"${command%%[![:space:]]*}"}"
+  command="${command%"${command##*[![:space:]]}"}"
   if [[ -z "$command" ]]; then
     return
   fi
 
+  case "$command" in
+    orchestra_*|_orchestra_*)
+      return
+      ;;
+  esac
+
   # Avoid logging duplicate consecutive commands within the same shell
   if [[ "$command" == "${ORCHESTRA_LAST_COMMAND-}" ]]; then
     return
   fi
   ORCHESTRA_LAST_COMMAND="$command"
 
+  local pane_id=""
   local session_name=""
   if command -v tmux >/dev/null 2>&1 && [[ -n "${TMUX-}" ]]; then
+    pane_id="${TMUX_PANE-}"
+    if [[ -z "$pane_id" ]]; then
+      pane_id="$(tmux display-message -p '#{pane_id}' 2>/dev/null || echo "")"
+    fi
     session_name="$(tmux display-message -p '#{session_name}' 2>/dev/null || echo "")"
   fi
   session_name="${session_name:-shell}"
 
   local key
-  key=$(_orchestra_history_key "$session_name")
+  if [[ -n "$pane_id" ]]; then
+    key=$(_orchestra_history_key "$pane_id")
+  else
+    key=$(_orchestra_history_key "$session_name")
+  fi
   if [[ -z "$key" ]]; then
     key="shell"
   fi
@@ -74,31 +164,65 @@ orchestra_log_command() {
   local timestamp
   timestamp=$(date '+%Y-%m-%dT%H:%M:%S%z')
   printf '%s\t%s\n' "$timestamp" "$command" >> "$ORCHESTRA_HISTORY_DIR/$key.log"
+
+  local app
+  app="$(_orchestra_normalize_app "$command")"
+  if [[ -n "$app" ]]; then
+    printf '%s\n' "$app" > "$ORCHESTRA_HISTORY_DIR/$key.last_app"
+  fi
+  printf '%s\n' "$command" > "$ORCHESTRA_HISTORY_DIR/$key.last_cmd"
 }
 
 _orchestra_install_hook_bash() {
-  if [[ "${PROMPT_COMMAND-}" == *orchestra_log_command* ]]; then
+  _orchestra_bash_preexec_hook() {
+    if [[ "${ORCHESTRA_DEBUG_TRAP_ACTIVE-}" == "1" ]]; then
+      return
+    fi
+    ORCHESTRA_DEBUG_TRAP_ACTIVE=1
+    local cmd="${BASH_COMMAND-}"
+    ORCHESTRA_DEBUG_TRAP_ACTIVE=0
+    orchestra_log_command "$cmd"
+  }
+
+  local existing_debug
+  existing_debug="$(trap -p DEBUG 2>/dev/null | sed -n "s/^trap -- '\(.*\)' DEBUG$/\1/p")"
+  if [[ "$existing_debug" == *"_orchestra_bash_preexec_hook"* ]]; then
     return
   fi
-  if [[ -n "${PROMPT_COMMAND-}" ]]; then
-    PROMPT_COMMAND="orchestra_log_command; ${PROMPT_COMMAND}"
+
+  if [[ -n "$existing_debug" ]]; then
+    trap "_orchestra_bash_preexec_hook; $existing_debug" DEBUG
   else
-    PROMPT_COMMAND="orchestra_log_command"
+    trap '_orchestra_bash_preexec_hook' DEBUG
   fi
 }
 
 _orchestra_install_hook_zsh() {
+  _orchestra_zsh_preexec_hook() {
+    orchestra_log_command "$1"
+  }
+
+  if ! command -v add-zsh-hook >/dev/null 2>&1; then
+    autoload -Uz add-zsh-hook 2>/dev/null || true
+  fi
   if command -v add-zsh-hook >/dev/null 2>&1; then
-    add-zsh-hook precmd orchestra_log_command
+    add-zsh-hook preexec _orchestra_zsh_preexec_hook
   else
-    # Fallback: append to precmd_functions manually
-    if [[ -z "${precmd_functions[(r)orchestra_log_command]}" ]]; then
-      precmd_functions+=(orchestra_log_command)
+    # Fallback: append to preexec_functions manually
+    if [[ -z "${preexec_functions[(r)_orchestra_zsh_preexec_hook]}" ]]; then
+      preexec_functions+=(_orchestra_zsh_preexec_hook)
     fi
   fi
 }
 
 _orchestra_install_hook() {
+  case "$-" in
+    *i*) ;;
+    *)
+      return
+      ;;
+  esac
+
   if [[ -n "${ZSH_VERSION-}" ]]; then
     _orchestra_install_hook_zsh
   else