@humanu/orchestra 0.5.42 → 0.5.49

package/package.json

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

package/resources/api/tmux.sh

@@ -737,8 +737,13 @@ tmux_session_preview() {
   else
     echo "<<<IDLE:false>>>"
   fi
-  
-  echo "$txt"
+
+  # If no content after processing, show placeholder
+  if [[ -z "$txt" ]]; then
+    echo "(session active, no visible output)"
+  else
+    echo "$txt"
+  fi
 }
 
 # --------------------------- Advanced Operations ----------------------------

package/resources/scripts/copy_env.sh

@@ -146,24 +146,31 @@ copy_env_files() {
 
             if [[ "$trimmed" == "/" ]]; then
                 local found_root=0
-                for env_file in "$base"/.env*; do
+                while IFS= read -r -d '' env_file; do
                     [[ -f "$env_file" ]] || continue
-                    mkdir -p "$target_root"
+                    local rel_path="${env_file#$base/}"
+                    if [[ "$rel_path" == "$env_file" ]]; then
+                        rel_path="$(basename "$env_file")"
+                    fi
+                    local dest_path="$target_root/$rel_path"
+                    mkdir -p "$(dirname "$dest_path")"
                     local err_msg
-                    err_msg="$(cp "$env_file" "$target_root/$(basename "$env_file")" 2>&1)"
+                    err_msg="$(cp "$env_file" "$dest_path" 2>&1)"
                     if [[ $? -eq 0 ]]; then
                         (( overall_copied++ ))
                         location_copied=1
                         found_root=1
-                        (( quiet != 1 )) && echo "   ✅ Copied $(basename "$env_file") from $base/"
-                        copy_env_log "INFO" "Copied $(basename "$env_file") from $base/"
+                        (( quiet != 1 )) && echo "   ✅ Copied $rel_path from $base/"
+                        copy_env_log "INFO" "Copied $rel_path from $base/"
                     else
                         (( overall_failed++ ))
                         (( location_failed++ ))
-                        (( quiet != 1 )) && echo "   ❌ Failed to copy $(basename "$env_file") from $base/"
-                        copy_env_log "ERROR" "Failed to copy $(basename "$env_file") from $base/: ${err_msg:-unknown error}"
+                        (( quiet != 1 )) && echo "   ❌ Failed to copy $rel_path from $base/"
+                        copy_env_log "ERROR" "Failed to copy $rel_path from $base/: ${err_msg:-unknown error}"
                     fi
-                done
+                done < <(find "$base" \
+                    \( -path "$target_root" -o -path "$target_root/*" -o -path "$base/.git" -o -path "$base/.git/*" -o -path "$base/worktrees" -o -path "$base/worktrees/*" \) -prune -o \
+                    -type f -name '.env*' -print0 2>/dev/null)
                 if [[ $found_root -eq 1 ]]; then
                     break
                 fi

package/resources/scripts/gw.sh

@@ -56,7 +56,8 @@ fi
     "git/list_worktrees.sh" \
     "git/checkout_worktree.sh" \
     "git/status.sh" \
-    "env/copy_env_command.sh"
+    "env/copy_env_command.sh" \
+    "tmux/new_session_command.sh"
   do
     if [[ -f "$COMMANDS_DIR/$command_file" ]]; then
       # shellcheck source=/dev/null
@@ -138,13 +139,19 @@ usage() {
   echo "  status [git status args]      Show current worktree + git status"
   echo "  update, --update              Check for available updates"
   echo ""
+  echo "Tmux flags:"
+  echo "  --branch <branch>             Branch name for tmux session worktree"
+  echo "  --new-tmux                    Create a new tmux session for the branch"
+  echo "  --cmd <command>               Command to run inside the new session"
+  echo ""
   echo "Examples:"
   echo "  $(basename "$0")             # interactive picker (tmux session management)"
   echo "  $(basename "$0") ls          # list worktrees only"
   echo "  $(basename "$0") ch -b feat/x # create and switch to worktree"
+  echo "  $(basename "$0") --branch main --new-tmux --cmd \"git status\""
   echo "  $(basename "$0") update      # check for available updates"
   echo ""
-  echo "Note: tmux session management is only available via the interactive menu (no args)."
+  echo "Note: tmux session management is available via flags or the interactive menu."
 }
 
 
@@ -184,6 +191,49 @@ if [ $# -eq 0 ]; then
   exit 0
 fi
 
+new_tmux=false
+tmux_branch=""
+tmux_cmd=""
+while [[ $# -gt 0 ]]; do
+  case "$1" in
+    --branch|-b)
+      [[ $# -lt 2 ]] && { err "--branch requires a value"; exit 1; }
+      tmux_branch="$2"
+      shift 2
+      ;;
+    --cmd|-c)
+      [[ $# -lt 2 ]] && { err "--cmd requires a value"; exit 1; }
+      tmux_cmd="$2"
+      shift 2
+      ;;
+    --new-tmux)
+      new_tmux=true
+      shift
+      ;;
+    --)
+      shift
+      break
+      ;;
+    *)
+      break
+      ;;
+  esac
+done
+
+if $new_tmux; then
+  if [[ -z "$tmux_branch" || -z "$tmux_cmd" ]]; then
+    err "Usage: $(basename "$0") --branch <branch> --new-tmux --cmd \"<command>\""
+    exit 1
+  fi
+  cmd_new_tmux_session_with_command "$tmux_branch" "$tmux_cmd"
+  exit $?
+fi
+
+if [[ -n "$tmux_branch" || -n "$tmux_cmd" ]]; then
+  err "--branch/--cmd require --new-tmux"
+  exit 1
+fi
+
 COMMAND="$1"; shift || true
 case "$COMMAND" in
   b|create|add)        cmd_create_worktree "$@" ;;

package/resources/scripts/shell/env/copy_env_core.sh

@@ -73,24 +73,31 @@ copy_env_files() {
 
             if [[ "$trimmed" == "/" ]]; then
                 local found_root=0
-                for env_file in "$base"/.env*; do
+                while IFS= read -r -d '' env_file; do
                     [[ -f "$env_file" ]] || continue
-                    mkdir -p "$target_root"
+                    local rel_path="${env_file#$base/}"
+                    if [[ "$rel_path" == "$env_file" ]]; then
+                        rel_path="$(basename "$env_file")"
+                    fi
+                    local dest_path="$target_root/$rel_path"
+                    mkdir -p "$(dirname "$dest_path")"
                     local err_msg
-                    err_msg="$(cp "$env_file" "$target_root/$(basename "$env_file")" 2>&1)"
+                    err_msg="$(cp "$env_file" "$dest_path" 2>&1)"
                     if [[ $? -eq 0 ]]; then
                         (( overall_copied++ ))
                         location_copied=1
                         found_root=1
-                        (( quiet != 1 )) && echo "   ✅ Copied $(basename "$env_file") from $base/"
-                        copy_env_log "INFO" "Copied $(basename "$env_file") from $base/"
+                        (( quiet != 1 )) && echo "   ✅ Copied $rel_path from $base/"
+                        copy_env_log "INFO" "Copied $rel_path from $base/"
                     else
                         (( overall_failed++ ))
                         (( location_failed++ ))
-                        (( quiet != 1 )) && echo "   ❌ Failed to copy $(basename "$env_file") from $base/"
-                        copy_env_log "ERROR" "Failed to copy $(basename "$env_file") from $base/: ${err_msg:-unknown error}"
+                        (( quiet != 1 )) && echo "   ❌ Failed to copy $rel_path from $base/"
+                        copy_env_log "ERROR" "Failed to copy $rel_path from $base/: ${err_msg:-unknown error}"
                     fi
-                done
+                done < <(find "$base" \
+                    \( -path "$target_root" -o -path "$target_root/*" -o -path "$base/.git" -o -path "$base/.git/*" -o -path "$base/worktrees" -o -path "$base/worktrees/*" \) -prune -o \
+                    -type f -name '.env*' -print0 2>/dev/null)
                 if [[ $found_root -eq 1 ]]; then
                     break
                 fi

package/resources/scripts/shell/git/gwr_worktree_title.sh

@@ -1,22 +1,10 @@
 # shellcheck shell=bash
 
 gwr_get_current_worktree_title() {
-    local branch=""
     local worktree=""
 
-    if command -v git >/dev/null 2>&1 && git rev-parse --git-dir >/dev/null 2>&1; then
-        branch="$(git rev-parse --abbrev-ref HEAD 2>/dev/null || echo "")"
-        if [[ -n "$branch" && "$branch" != "HEAD" ]]; then
-            worktree="$branch"
-        else
-            worktree="$(git rev-parse --short HEAD 2>/dev/null || echo "")"
-        fi
-    fi
-
-    if [[ -z "$worktree" ]]; then
-        worktree="$(pwd -P)"
-        worktree="$(basename "$worktree")"
-    fi
+    worktree="$(pwd -P)"
+    worktree="$(basename "$worktree")"
 
     worktree="${worktree//\//-}"
     worktree="${worktree// /-}"
@@ -25,5 +13,5 @@ gwr_get_current_worktree_title() {
         worktree="unknown"
     fi
 
-    printf 'orchestra [orchestra/%s]' "$worktree"
+    printf 'orchestra: /%s' "$worktree"
 }

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

@@ -0,0 +1,54 @@
+# shellcheck shell=bash
+
+cmd_new_tmux_session_with_command() {
+  local branch_name="$1"
+  local command_line="$2"
+
+  local root; root="$(git_require_repo_root)" || return 1
+  local shared_root; shared_root="$(git_shared_root 2>/dev/null)"
+  [[ -z "$shared_root" ]] && shared_root="$root"
+  local source_root; source_root="$(git_current_path)"
+
+  if ! tmux_available; then
+    err "tmux not installed"
+    return 1
+  fi
+
+  if [[ -z "$branch_name" ]]; then
+    err "Branch name required"
+    return 1
+  fi
+
+  if [[ -z "${command_line// }" ]]; then
+    err "Command required"
+    return 1
+  fi
+
+  local wt=""
+  if git_branch_exists "$branch_name"; then
+    wt="$(git_branch_to_worktree_path "$branch_name")"
+    if [[ -z "$wt" ]]; then
+      info "🌳 Creating worktree for existing branch '$branch_name'..."
+      wt="$(git_ensure_worktree_for_branch "$branch_name")"
+      copy_env_files "$source_root" "$wt" "$shared_root"
+    fi
+  else
+    err "Branch '$branch_name' does not exist"
+    return 1
+  fi
+
+  if [[ -z "$wt" ]]; then
+    err "Worktree not found for branch '$branch_name'"
+    return 1
+  fi
+
+  local session=""
+  session="$(tmux_ensure_session "$branch_name" "" "$wt")" || return 1
+  if [[ -z "$session" ]]; then
+    err "Failed to create tmux session"
+    return 1
+  fi
+
+  tmux_send_keys "$session" "$command_line" || return 1
+  tmux_attach_session "$session"
+}