@humanu/orchestra 0.5.61 → 0.5.62

package/package.json

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

package/resources/api/tmux.sh

@@ -24,6 +24,9 @@ fi
 # Note: tmux session names cannot contain ':'; use a safe delimiter
 ORCHESTRA_SESSION_DELIM="__"
 
+# Absolute directory that contains this script when sourced.
+_TMUX_API_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd -P)"
+
 # Helper: return delimiter
 _tmux_delim() { echo "$ORCHESTRA_SESSION_DELIM"; }
 
@@ -108,18 +111,38 @@ _tmux_normalize_app_from_command() {
 
 # Helper: absolute path to the command hook script (if present)
 _orchestra_command_hook() {
-  local root
-  root="$(repo_root)"
-  if [[ -z "$root" ]]; then
-    echo ""
-    return
+  local hook=""
+
+  # 1) Explicit install root set by wrappers (Homebrew/NPM)
+  if [[ -n "${GW_ORCHESTRATOR_ROOT-}" ]]; then
+    hook="$GW_ORCHESTRATOR_ROOT/shell/orchestra-command-hook.sh"
+    if [[ -f "$hook" ]]; then
+      echo "$hook"
+      return
+    fi
   fi
-  local hook="$root/shell/orchestra-command-hook.sh"
+
+  # 2) Resolve relative to this script's install location
+  local script_root
+  script_root="$(cd "$_TMUX_API_DIR/.." && pwd -P)"
+  hook="$script_root/shell/orchestra-command-hook.sh"
   if [[ -f "$hook" ]]; then
     echo "$hook"
-  else
-    echo ""
+    return
   fi
+
+  # 3) Fallback to repo root for legacy/dev flows
+  local root
+  root="$(repo_root)"
+  if [[ -n "$root" ]]; then
+    hook="$root/shell/orchestra-command-hook.sh"
+    if [[ -f "$hook" ]]; then
+      echo "$hook"
+      return
+    fi
+  fi
+
+  echo ""
 }
 
 # Source the command hook inside a tmux session to enable command history logging
@@ -144,8 +167,8 @@ _tmux_source_command_hook() {
     pane_id="${line%% *}"
     pane_cmd="${line#* }"
     case "$pane_cmd" in
-      bash|zsh|sh|fish|dash|ksh)
-        tmux send-keys -t "$pane_id" "source '$hook'" C-m 2>/dev/null || true
+      bash|zsh)
+        tmux send-keys -t "$pane_id" ". '$hook'" C-m 2>/dev/null || true
         ;;
       *)
         ;;
@@ -1296,6 +1319,8 @@ allowed_prefixes = (
 def clean_tokens(tokens):
     while tokens and tokens[0] in {"$", "#", "%"}:
         tokens = tokens[1:]
+    while tokens and (tokens[0].endswith("$") or tokens[0].endswith("#") or tokens[0].endswith("%")):
+        tokens = tokens[1:]
     return tokens
 
 
@@ -1468,7 +1493,7 @@ def normalize_app(cmd: str) -> str:
         return ""
     return base
 
-app_commands = history_commands
+app_commands = history_commands if history_commands else app_command_candidates
 app_prefix = ""
 for candidate in reversed(app_commands):
     app_prefix = normalize_app(candidate)