@humanu/orchestra 0.5.29 → 0.5.30

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

@@ -0,0 +1,68 @@
+# shellcheck shell=bash
+
+cmd_checkout_worktree() {
+    local create_new=false
+    local branch_name=""
+    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="$(git_current_path)"
+    
+    if [[ "${1-}" == "-b" ]]; then
+        [[ -z "${2-}" ]] && { err "Branch name required for -b"; echo "Usage: gw checkout -b <branch>"; return 1; }
+        create_new=true
+        branch_name="$2"
+        [[ "$#" -gt 2 ]] && { err "Too many args"; return 1; }
+    else
+        [[ -z "${1-}" ]] && { err "Branch name required"; echo "Usage: gw checkout <branch>"; return 1; }
+        branch_name="$1"
+        [[ "$#" -gt 1 ]] && { err "Too many args"; return 1; }
+    fi
+
+    if $create_new; then
+        if git_branch_exists "$branch_name"; then
+            # Branch exists, ensure worktree exists
+            local wt; wt="$(git_branch_to_worktree_path "$branch_name")"
+            if [[ -n "$wt" ]]; then
+                info "✅ Worktree exists at '$wt'"
+                echo "cd \"$wt\""
+            else
+                # Create worktree for existing branch
+                info "🌳 Creating worktree for existing branch '$branch_name'..."
+                wt="$(git_ensure_worktree_for_branch "$branch_name")"
+                copy_env_files "$source_root" "$wt" "$shared_root"
+                echo "cd \"$wt\""
+            fi
+            return 0
+        else
+            # Create new branch and worktree
+            cmd_create_worktree "$branch_name" || return $?
+            local wt; wt="$(git_branch_to_worktree_path "$branch_name")"
+            [[ -n "$wt" ]] && {
+                echo "cd \"$wt\""
+                return 0
+            }
+            err "Worktree created but not found"
+            return 1
+        fi
+    else
+        # Switch to existing branch
+        local wt; wt="$(git_branch_to_worktree_path "$branch_name")"
+        if [[ -n "$wt" ]]; then
+            echo "cd \"$wt\""
+            return 0
+        fi
+
+        # Try to create worktree for existing branch
+        if git_branch_exists "$branch_name"; 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"
+            echo "cd \"$wt\""
+            return 0
+        else
+            err "Branch '$branch_name' does not exist"
+            return 1
+        fi
+    fi
+}

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

@@ -0,0 +1,23 @@
+# shellcheck shell=bash
+
+cmd_create_worktree() {
+    if [ -z "${1-}" ]; then 
+        err "Branch name required"
+        echo "Usage: gw create <branch>"
+        return 1
+    fi
+    local branch_name="$1"
+    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="$(git_current_path)"
+
+    local dir; dir="$(git_build_worktree_path "$branch_name")"
+
+    info "🌳 Creating branch '$branch_name' and worktree at '$dir'..."
+    dir="$(git_create_branch_and_worktree "$branch_name")"
+    copy_env_files "$source_root" "$dir" "$shared_root"
+    info "✅ Success! Worktree created at '$dir'."
+    echo "cd \"$dir\""
+    (cd "$dir" && git_status_short)
+}

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

@@ -0,0 +1,27 @@
+# shellcheck shell=bash
+
+cmd_delete_worktree() {
+    if [ -z "${1-}" ]; then 
+        err "Branch name required"
+        echo "Usage: gw delete <branch>"
+        return 1
+    fi
+    local branch_name="$1"
+    git_require_repo || return 1
+    
+    local worktree_path; worktree_path="$(git_branch_to_worktree_path "$branch_name")"
+    
+    info "🗑️  Removing worktree and deleting branch '$branch_name'..."
+    
+    # Remove worktree if it exists
+    if [[ -n "$worktree_path" ]] && [[ -d "$worktree_path" ]]; then
+      git_remove_worktree "$worktree_path"
+    fi
+    
+    # Delete branch if it exists
+    if git_branch_exists "$branch_name"; then
+      git_delete_branch "$branch_name"
+    fi
+    
+    info "🧹 Done."
+}

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

@@ -0,0 +1,29 @@
+# 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="${worktree//\//-}"
+    worktree="${worktree// /-}"
+
+    if [[ -z "$worktree" ]]; then
+        worktree="unknown"
+    fi
+
+    printf 'orchestra [orchestra/%s]' "$worktree"
+}

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

@@ -0,0 +1,22 @@
+# shellcheck shell=bash
+
+cmd_list_worktrees() {
+    local root; root="$(git_require_repo_root)" || return 1
+    
+    local here; here="$(git_current_path)"
+    info "🌳 Listing Git Worktrees (repo: $root)"
+    echo ""
+    printf '     %-35s %-12s %s\n' "BRANCH" "HEAD" "PATH"
+    printf '   %s\n' "------------------------------------------------------------------------------------------"
+    
+    while IFS=$'\t' read -r path branch sha; do
+        local rel="$path"
+        [[ "$path" == "$root" ]] && rel="."
+        [[ "$path" == "$root"/* ]] && rel="${path#$root/}"
+        local indicator="  "
+        [[ "$path" == "$here" ]] && indicator="◉ "
+        printf '%s🌿 %-35s %-12s %s\n' "$indicator" "$branch" "$sha" "$rel"
+    done < <(git_list_worktrees)
+    
+    printf '   %s\n' "------------------------------------------------------------------------------------------"
+}

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

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# shellcheck shell=bash
+
+# Master file that sources all individual bridge functions for merge operations
+# This maintains the same interface while using modular files
+
+# Source individual merge functions
+source "$(dirname "${BASH_SOURCE[0]}")/merge_from_primary.sh"
+source "$(dirname "${BASH_SOURCE[0]}")/rebase_from_primary.sh"
+source "$(dirname "${BASH_SOURCE[0]}")/merge_into_primary.sh"
+source "$(dirname "${BASH_SOURCE[0]}")/squash_into_primary.sh"

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

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# shellcheck shell=bash
+
+# Master file that sources all individual bridge functions for repository operations
+# This maintains the same interface while using modular files
+
+# Source individual repo functions
+source "$(dirname "${BASH_SOURCE[0]}")/repo_info.sh"
+source "$(dirname "${BASH_SOURCE[0]}")/git_status.sh"
+source "$(dirname "${BASH_SOURCE[0]}")/enhanced_git_status.sh"
+source "$(dirname "${BASH_SOURCE[0]}")/primary_branch.sh"

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

@@ -0,0 +1,21 @@
+# shellcheck shell=bash
+
+cmd_status() {
+    local root; root="$(git_require_repo_root)" || return 1
+    
+    local here; here="$(git_current_path)"
+    local rel="$here"
+    [[ "$here" == "$root" ]] && rel="."
+    [[ "$here" == "$root"/* ]] && rel="${here#$root/}"
+    
+    local branch; branch="$(git_current_branch)"
+    if [[ -z "$branch" ]]; then
+        branch="$(git_current_commit_short)"
+        [[ -z "$branch" ]] && { err "Cannot determine branch/commit"; return 1; }
+        info "🌳 In worktree '$rel' (Detached HEAD: $branch)"
+    else
+        info "🌳 In worktree '$rel' on branch '$branch'"
+    fi
+    echo ""
+    git_status "$@"
+}

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

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+# shellcheck shell=bash
+
+# Master file that sources all individual bridge functions for worktree operations
+# This maintains the same interface while using modular files
+
+# Source individual worktree functions
+source "$(dirname "${BASH_SOURCE[0]}")/list_worktrees.sh"
+source "$(dirname "${BASH_SOURCE[0]}")/check_branch.sh"
+source "$(dirname "${BASH_SOURCE[0]}")/create_worktree.sh"
+source "$(dirname "${BASH_SOURCE[0]}")/create_worktree_from_existing.sh"
+source "$(dirname "${BASH_SOURCE[0]}")/create_worktree_from_remote.sh"
+source "$(dirname "${BASH_SOURCE[0]}")/delete_worktree.sh"
+source "$(dirname "${BASH_SOURCE[0]}")/delete_worktree_only.sh"
+source "$(dirname "${BASH_SOURCE[0]}")/delete_branch_only.sh"
+source "$(dirname "${BASH_SOURCE[0]}")/switch_worktree.sh"

package/resources/scripts/shell/gw_debug.sh

@@ -0,0 +1,3 @@
+# shellcheck shell=bash
+
+debug() { :; }

package/resources/scripts/shell/gw_err.sh

@@ -0,0 +1,3 @@
+# shellcheck shell=bash
+
+err() { printf '❌ %s\n' "$*" 1>&2; }

package/resources/scripts/shell/gw_have_cmd.sh

@@ -0,0 +1,3 @@
+# shellcheck shell=bash
+
+have_cmd() { command -v "$1" >/dev/null 2>&1; }

package/resources/scripts/shell/gw_info.sh

@@ -0,0 +1,3 @@
+# shellcheck shell=bash
+
+info() { printf '%s\n' "$*"; }

package/resources/scripts/shell/gw_legacy_wrappers.sh

@@ -0,0 +1,7 @@
+# shellcheck shell=bash
+
+repo_root() { git_repo_root; }
+current_abs_path() { git_current_path; }
+branch_to_slug() { git_branch_to_slug "$1"; }
+worktree_path_to_branch() { git_worktree_path_to_branch "$1"; }
+list_worktrees() { git_list_worktrees; }

package/resources/scripts/shell/gw_load.sh

@@ -0,0 +1,9 @@
+# shellcheck shell=bash
+
+gw_load_core() {
+  source "$SCRIPT_DIR/shell/gw_err.sh"
+  source "$SCRIPT_DIR/shell/gw_info.sh"
+  source "$SCRIPT_DIR/shell/gw_debug.sh"
+  source "$SCRIPT_DIR/shell/gw_have_cmd.sh"
+  source "$SCRIPT_DIR/shell/gw_legacy_wrappers.sh"
+}

package/resources/scripts/shell/gwr_binary.sh

@@ -0,0 +1,25 @@
+# shellcheck shell=bash
+
+gwr_find_binary() {
+    if [[ -n "${GW_TUI_BIN:-}" && -x "$GW_TUI_BIN" ]]; then
+        echo "$GW_TUI_BIN"
+        return 0
+    fi
+
+    local binary_paths=(
+        "$SCRIPT_DIR/orchestra"
+        "$SCRIPT_DIR/gw-tui"
+        "$SCRIPT_DIR/gw-tui/target/release/gw-tui"
+        "$SCRIPT_DIR/gw-tui/target/debug/gw-tui"
+        "$(command -v gw-tui 2>/dev/null || true)"
+    )
+
+    for path in "${binary_paths[@]}"; do
+        if [[ -n "$path" && -f "$path" && -x "$path" ]]; then
+            echo "$path"
+            return 0
+        fi
+    done
+
+    return 1
+}

package/resources/scripts/shell/gwr_bridge.sh

@@ -0,0 +1,10 @@
+# shellcheck shell=bash
+
+gwr_check_bridge_script() {
+    local bridge_path="$SCRIPT_DIR/gw-bridge.sh"
+    if [[ ! -x "$bridge_path" ]]; then
+        gwr_error "gw-bridge.sh not found or not executable at: $bridge_path"
+        gwr_error "Please ensure the bridge script exists and is executable."
+        exit 1
+    fi
+}

package/resources/scripts/shell/gwr_colors.sh

@@ -0,0 +1,7 @@
+# shellcheck shell=bash
+
+GW_COLOR_RED='\033[0;31m'
+GW_COLOR_GREEN='\033[0;32m'
+GW_COLOR_YELLOW='\033[1;33m'
+GW_COLOR_BLUE='\033[0;34m'
+GW_COLOR_RESET='\033[0m'

package/resources/scripts/shell/gwr_git.sh

@@ -0,0 +1,8 @@
+# shellcheck shell=bash
+
+gwr_check_git_repo() {
+    if ! git rev-parse --git-dir >/dev/null 2>&1; then
+        gwr_error "Not a git repository or git command not found."
+        exit 1
+    fi
+}

package/resources/scripts/shell/gwr_load.sh

@@ -0,0 +1,12 @@
+# shellcheck shell=bash
+
+gwr_load_core() {
+    source "$SCRIPT_DIR/shell/gwr_colors.sh"
+    source "$SCRIPT_DIR/shell/gwr_logging.sh"
+    source "$SCRIPT_DIR/shell/gwr_git.sh"
+    source "$SCRIPT_DIR/shell/gwr_bridge.sh"
+    source "$SCRIPT_DIR/shell/gwr_binary.sh"
+    source "$SCRIPT_DIR/shell/git/gwr_worktree_title.sh"
+    source "$SCRIPT_DIR/shell/gwr_terminal.sh"
+    source "$SCRIPT_DIR/shell/gwr_usage.sh"
+}

package/resources/scripts/shell/gwr_logging.sh

@@ -0,0 +1,6 @@
+# shellcheck shell=bash
+
+gwr_info() { printf "${GW_COLOR_BLUE:-}[INFO]${GW_COLOR_RESET:-} %s\n" "$*" >&2; }
+gwr_success() { printf "${GW_COLOR_GREEN:-}[SUCCESS]${GW_COLOR_RESET:-} %s\n" "$*" >&2; }
+gwr_warn() { printf "${GW_COLOR_YELLOW:-}[WARN]${GW_COLOR_RESET:-} %s\n" "$*" >&2; }
+gwr_error() { printf "${GW_COLOR_RED:-}[ERROR]${GW_COLOR_RESET:-} %s\n" "$*" >&2; }

package/resources/scripts/shell/gwr_terminal.sh

@@ -0,0 +1,13 @@
+# shellcheck shell=bash
+
+gwr_set_terminal_title() {
+    local tty_device
+    tty_device="$(tty 2>/dev/null || true)"
+    if [[ -z "$tty_device" || ! -w "$tty_device" ]]; then
+        return 0
+    fi
+
+    local title
+    title="$(gwr_get_current_worktree_title)"
+    printf '\033]0;%s\007' "$title" >"$tty_device" 2>/dev/null || true
+}

package/resources/scripts/shell/gwr_usage.sh

@@ -0,0 +1,49 @@
+# shellcheck shell=bash
+
+gwr_show_usage() {
+    cat << EOF
+gwr - Git Worktree Rust TUI
+
+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
+
+Features:
+  • Interactive worktree and session management
+  • Visual tree display of worktrees and their tmux sessions  
+  • Real-time session previews and git status
+  • Keyboard navigation with vim-like bindings
+  • Session creation, deletion, and renaming
+  • AI-powered session naming (when configured)
+
+Navigation:
+  ↑/↓             Navigate items
+  Enter           Select worktree or attach to session
+  s               Auth menu (if enabled)
+  Space           Expand/collapse worktree sessions
+  d               Delete worktree or kill session
+  r               Rename session (AI-powered)
+  c               Create new worktree
+  o               Configure Anthropic API key
+  Ctrl+R          Refresh data
+  q/Esc           Quit
+
+Requirements:
+  • Git repository
+  • Rust TUI binary (built with build.sh)
+  • gw-bridge.sh script
+  • tmux (optional, for session management)
+
+For the original shell-based interface, use: gw
+
+Examples:
+  gwr             # Launch interactive TUI
+  gwr --debug     # Launch with debug information
+  gwr --help      # Show this help
+
+EOF
+}

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

@@ -0,0 +1,109 @@
+#!/usr/bin/env bash
+
+# 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
+# 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.
+
+if [[ -n "${ORCHESTRA_PROMPT_HOOK_INSTALLED-}" ]]; then
+  return 0 2>/dev/null || exit 0
+fi
+
+ORCHESTRA_HISTORY_DIR="${ORCHESTRA_HISTORY_DIR:-$HOME/.orchestra/history}"
+ORCHESTRA_PROMPT_HOOK_INSTALLED=1
+
+_orchestra_history_key() {
+  local key="$1"
+  key="${key//\//_}"
+  key=$(echo "$key" | tr '[:space:]' '_')
+  key=$(echo "$key" | tr -c '[:alnum:]_-' '_')
+  while [[ "$key" == *"__"* ]]; do
+    key="${key//__/_}"
+  done
+  key="${key##_}"
+  key="${key%%_}"
+  echo "$key"
+}
+
+_orchestra_capture_command() {
+  local cmd=""
+  if [[ -n "${ZSH_VERSION-}" ]]; then
+    # fc -ln -1 returns the most recent command without line numbers
+    cmd="$(fc -ln -1 2>/dev/null)"
+  else
+    cmd="$(history 1 2>/dev/null)"
+    cmd="${cmd#*[0-9] }"
+  fi
+  printf '%s' "$cmd"
+}
+
+orchestra_log_command() {
+  local command=$(_orchestra_capture_command)
+  command="${command## }"
+  if [[ -z "$command" ]]; then
+    return
+  fi
+
+  # Avoid logging duplicate consecutive commands within the same shell
+  if [[ "$command" == "${ORCHESTRA_LAST_COMMAND-}" ]]; then
+    return
+  fi
+  ORCHESTRA_LAST_COMMAND="$command"
+
+  local session_name=""
+  if command -v tmux >/dev/null 2>&1 && [[ -n "${TMUX-}" ]]; then
+    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 [[ -z "$key" ]]; then
+    key="shell"
+  fi
+
+  mkdir -p "$ORCHESTRA_HISTORY_DIR"
+
+  local timestamp
+  timestamp=$(date '+%Y-%m-%dT%H:%M:%S%z')
+  printf '%s\t%s\n' "$timestamp" "$command" >> "$ORCHESTRA_HISTORY_DIR/$key.log"
+}
+
+_orchestra_install_hook_bash() {
+  if [[ "${PROMPT_COMMAND-}" == *orchestra_log_command* ]]; then
+    return
+  fi
+  if [[ -n "${PROMPT_COMMAND-}" ]]; then
+    PROMPT_COMMAND="orchestra_log_command; ${PROMPT_COMMAND}"
+  else
+    PROMPT_COMMAND="orchestra_log_command"
+  fi
+}
+
+_orchestra_install_hook_zsh() {
+  if command -v add-zsh-hook >/dev/null 2>&1; then
+    add-zsh-hook precmd orchestra_log_command
+  else
+    # Fallback: append to precmd_functions manually
+    if [[ -z "${precmd_functions[(r)orchestra_log_command]}" ]]; then
+      precmd_functions+=(orchestra_log_command)
+    fi
+  fi
+}
+
+_orchestra_install_hook() {
+  if [[ -n "${ZSH_VERSION-}" ]]; then
+    _orchestra_install_hook_zsh
+  else
+    _orchestra_install_hook_bash
+  fi
+}
+
+_orchestra_install_hook

package/resources/scripts/shell/orchestra-local.sh

@@ -0,0 +1,87 @@
+#!/bin/bash
+
+# Orchestra local development command.
+# Usage: orchestra-local [--root <path>] [--worktree <name>] [extra args]
+#
+# - Default root is $HOME/repos/orchestrator (override via ORCHESTRA_LOCAL_ROOT
+#   or --root).
+# - Worktree flag resolves to <root>/worktrees/<name>/gwr.sh for convenience.
+
+set -euo pipefail
+
+print_usage() {
+  cat <<'EOF'
+Usage: orchestra-local [--root <path>] [--worktree <name>] [args...]
+
+Launch the local Orchestra TUI directly from your cloned repository.
+
+Options:
+  --root <path>       Path to the orchestrator repo (default: $HOME/repos/orchestrator)
+                      or the value of $ORCHESTRA_LOCAL_ROOT if set.
+  -w, --worktree <n>  Use the worktree wrapper at <root>/worktrees/<n>/gwr.sh
+  -h, --help          Show this help and exit.
+
+Any remaining arguments are forwarded to the local gwr.sh script.
+
+Environment:
+  ORCHESTRA_LOCAL_ROOT  Overrides the default repo path.
+EOF
+}
+
+main() {
+  local root="${ORCHESTRA_LOCAL_ROOT:-$HOME/repos/orchestrator}"
+  local worktree=""
+  local args=()
+
+  while [[ $# -gt 0 ]]; do
+    case $1 in
+      --root)
+        [[ $# -lt 2 ]] && { echo "--root requires a value" >&2; exit 1; }
+        root="$2"
+        shift 2
+        ;;
+      -w|--worktree)
+        [[ $# -lt 2 ]] && { echo "--worktree requires a value" >&2; exit 1; }
+        worktree="$2"
+        shift 2
+        ;;
+      -h|--help)
+        print_usage
+        return 0
+        ;;
+      --)
+        shift
+        args+=("$@")
+        break
+        ;;
+      *)
+        args+=("$1")
+        shift
+        ;;
+    esac
+  done
+
+  if [[ ! -d "$root" ]]; then
+    echo "orchestra-local: repository not found at $root" >&2
+    echo "Set ORCHESTRA_LOCAL_ROOT or use --root <path> to point to your clone." >&2
+    exit 1
+  fi
+
+  local script_path="$root/gwr.sh"
+  if [[ -n "$worktree" ]]; then
+    script_path="$root/worktrees/$worktree/gwr.sh"
+  fi
+
+  if [[ ! -f "$script_path" ]]; then
+    echo "orchestra-local: unable to locate $script_path" >&2
+    exit 1
+  fi
+
+  if [[ ${#args[@]} -gt 0 ]]; then
+    exec bash "$script_path" "${args[@]}"
+  else
+    exec bash "$script_path"
+  fi
+}
+
+main "$@"