@humanu/orchestra 0.5.61 → 0.5.63

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@humanu/orchestra",
-  "version": "0.5.61",
+  "version": "0.5.63",
   "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"; }
 
@@ -77,7 +80,7 @@ _tmux_normalize_app_from_command() {
 
   local base="${tokens[$i]}"
   base="${base##*/}"
-  base="$(printf '%s' "$base" | tr '[:upper:]' '[:lower:]' | tr -c 'a-z0-9._-:' '_')"
+  base="$(printf '%s' "$base" | tr '[:upper:]' '[:lower:]' | tr -c 'a-z0-9._:-' '_')"
   base="${base//__/_}"
   base="${base##_}"
   base="${base%%_}"
@@ -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
         ;;
       *)
         ;;
@@ -1166,6 +1189,8 @@ if history_arg:
         history_commands = history_commands[-50:]
 
 prompt_pattern = re.compile(r"^[A-Za-z0-9_.@~/-]+$")
+prompt_sigil_pattern = re.compile(r"^(?P<prompt>[^\t]{0,120}?)(?P<sigil>[$#%])\s+(?P<cmd>.+)$")
+simple_sigil_pattern = re.compile(r"^(?P<sigil>[$#%])\s+(?P<cmd>.+)$")
 disallowed_prompts = {
     "warning",
     "error",
@@ -1296,26 +1321,49 @@ 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
 
 
-for raw_line in lines:
+def extract_prompt_and_command(raw_line):
     stripped = raw_line.strip()
-    if not stripped or ":" not in stripped:
-        continue
-
-    prompt_part, command_part = stripped.split(":", 1)
-    prompt_part = prompt_part.strip().rstrip("#$%")
-    command_part = command_part.strip()
-
-    if not prompt_part or not command_part:
-        continue
+    if not stripped:
+        return "", ""
+
+    # Pattern 1: host:path:command (common bash/zsh prompts)
+    if ":" in stripped:
+        maybe_prompt, maybe_cmd = stripped.split(":", 1)
+        maybe_prompt = maybe_prompt.strip().rstrip("#$%")
+        maybe_cmd = maybe_cmd.strip()
+        if maybe_prompt and maybe_cmd and prompt_pattern.match(maybe_prompt):
+            prompt_lower = maybe_prompt.lower()
+            if prompt_lower not in disallowed_prompts:
+                return maybe_prompt, maybe_cmd
+
+    # Pattern 2: prompt ending with $, #, % (supports prompts without ':')
+    match = prompt_sigil_pattern.match(stripped)
+    if match:
+        maybe_prompt = (match.group("prompt") or "").strip().rstrip("#$%")
+        maybe_cmd = (match.group("cmd") or "").strip()
+        if maybe_cmd:
+            if maybe_prompt and maybe_prompt.lower() in disallowed_prompts:
+                return "", ""
+            return (maybe_prompt if maybe_prompt else match.group("sigil")), maybe_cmd
+
+    # Pattern 3: bare prompt lines like "$ git status"
+    match = simple_sigil_pattern.match(stripped)
+    if match:
+        maybe_cmd = (match.group("cmd") or "").strip()
+        if maybe_cmd:
+            return match.group("sigil"), maybe_cmd
+
+    return "", ""
 
-    if not prompt_pattern.match(prompt_part):
-        continue
 
-    prompt_lower = prompt_part.lower()
-    if prompt_lower in disallowed_prompts:
+for raw_line in lines:
+    prompt_part, command_part = extract_prompt_and_command(raw_line)
+    if not command_part:
         continue
 
     tokens = clean_tokens(command_part.split())
@@ -1468,7 +1516,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)

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

@@ -86,7 +86,7 @@ _orchestra_normalize_app() {
 
   local base="${tokens[$i]}"
   base="${base##*/}"
-  base="$(printf '%s' "$base" | tr '[:upper:]' '[:lower:]' | tr -c 'a-z0-9._-:' '_')"
+  base="$(printf '%s' "$base" | tr '[:upper:]' '[:lower:]' | tr -c 'a-z0-9._:-' '_')"
   base="${base//__/_}"
   base="${base##_}"
   base="${base%%_}"