@humanu/orchestra 0.5.77 → 0.5.78

package/resources/scripts/{gw.sh → orchestra-cli.sh}

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 ###############################################################################
-# gw.sh – Git-Worktree helper main entry point
+# orchestra-cli.sh - Orchestra CLI entry point
 # ---------------------------------------------------------------------------
 # This script prints a line like: cd "/abs/path" for your shell wrapper to eval
 # so your interactive shell actually changes directories. See wrapper notes
@@ -11,8 +11,8 @@
 
 # Recommended wrapper (place in ~/.bash_profile or ~/.zshrc):
 #
-# gw () {
-#   local script="/absolute/path/to/gw.sh"  # UPDATE THIS PATH
+# orchestra-cli () {
+#   local script="/absolute/path/to/orchestra-cli.sh"  # UPDATE THIS PATH
 #   local out
 #   out="$(command bash "$script" "$@")"
 #   local status=$?
@@ -32,8 +32,8 @@ set -o nounset
 # lastpipe not available on older macOS bash; ignore
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-source "$SCRIPT_DIR/shell/gw_load.sh"
-gw_load_core
+source "$SCRIPT_DIR/shell/cli_load.sh"
+cli_load_core
 
 # --------------------------- Module Loading ---------------------------------
 
@@ -115,7 +115,7 @@ set_terminal_title() {
   printf '\033]0;%s\007' "$title" >"$tty_device" 2>/dev/null || true
 }
 
-# Interactive functionality is provided by the Rust TUI (gw-tui)
+# Interactive functionality is provided by the Rust TUI (tui)
 # No longer sourcing interactive.sh - Rust TUI is the primary interface
 
 # --------------------------- core features ----------------------------------
@@ -157,27 +157,27 @@ usage() {
 
 if [ $# -eq 0 ]; then
   # Interactive mode by default - prefer Rust TUI if available
-  if command -v gw-tui >/dev/null 2>&1; then
+  if command -v tui >/dev/null 2>&1; then
     # Use Rust TUI if available
     set_terminal_title
-    gw-tui --bridge-path "$SCRIPT_DIR/gw-bridge.sh"
-  elif [[ -f "$SCRIPT_DIR/gw-tui/target/release/gw-tui" ]]; then
+    tui --services-path "$SCRIPT_DIR/services.sh"
+  elif [[ -f "$SCRIPT_DIR/tui/target/release/tui" ]]; then
     # Use locally built Rust TUI
     set_terminal_title
-    "$SCRIPT_DIR/gw-tui/target/release/gw-tui" --bridge-path "$SCRIPT_DIR/gw-bridge.sh"
-  elif [[ -f "$SCRIPT_DIR/gw-tui/target/debug/gw-tui" ]]; then
+    "$SCRIPT_DIR/tui/target/release/tui" --services-path "$SCRIPT_DIR/services.sh"
+  elif [[ -f "$SCRIPT_DIR/tui/target/debug/tui" ]]; then
     # Use debug build of Rust TUI
     set_terminal_title
-    "$SCRIPT_DIR/gw-tui/target/debug/gw-tui" --bridge-path "$SCRIPT_DIR/gw-bridge.sh"
+    "$SCRIPT_DIR/tui/target/debug/tui" --services-path "$SCRIPT_DIR/services.sh"
   else
     # No Rust TUI available - provide clear guidance
-    err "Interactive mode requires the Rust TUI (gw-tui)"
+    err "Interactive mode requires the Rust TUI (tui)"
     echo ""
     echo "To build:"
     echo "  ./build.sh              # Build Rust TUI binary"
     echo ""
     echo "Or build manually:"
-    echo "  cd gw-tui && cargo build --release"
+    echo "  cd tui && cargo build --release"
     echo ""
     echo "For command-line operations without interactive mode:"
     echo "  $0 ls                   # List worktrees"

package/resources/scripts/orchestra-local.sh

@@ -5,7 +5,7 @@
 #
 # - Default root is $HOME/repos/orchestrator (override via ORCHESTRA_LOCAL_ROOT
 #   or --root).
-# - Worktree flag resolves to <root>/worktrees/<name>/gwr.sh for convenience.
+# - Worktree flag resolves to <root>/worktrees/<name>/orchestra.sh for convenience.
 
 set -euo pipefail
 
@@ -18,10 +18,10 @@ 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
+  -w, --worktree <n>  Use the worktree wrapper at <root>/worktrees/<n>/orchestra.sh
   -h, --help          Show this help and exit.
 
-Any remaining arguments are forwarded to the local gwr.sh script.
+Any remaining arguments are forwarded to the local orchestra.sh script.
 
 Environment:
   ORCHESTRA_LOCAL_ROOT  Overrides the default repo path.
@@ -67,9 +67,9 @@ main() {
     exit 1
   fi
 
-  local script_path="$root/gwr.sh"
+  local script_path="$root/orchestra.sh"
   if [[ -n "$worktree" ]]; then
-    script_path="$root/worktrees/$worktree/gwr.sh"
+    script_path="$root/worktrees/$worktree/orchestra.sh"
   fi
 
   if [[ ! -f "$script_path" ]]; then
@@ -78,7 +78,7 @@ main() {
   fi
 
   # This launcher is explicitly for local development; ignore installed binary
-  # overrides so gwr.sh resolves the TUI binary from the selected checkout.
+  # overrides so orchestra.sh resolves the TUI binary from the selected checkout.
   unset GW_TUI_BIN
 
   if [[ ${#args[@]} -gt 0 ]]; then

package/resources/scripts/{gwr.sh → orchestra.sh}

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 ###############################################################################
-# gwr.sh – Git-Worktree Rust TUI launcher
+# orchestra.sh - Orchestra TUI launcher
 # ---------------------------------------------------------------------------
 # This script launches the Rust TUI application for git worktree and tmux
 # session management. It automatically detects the built binary location
@@ -10,8 +10,8 @@
 
 # Recommended wrapper (place in ~/.bash_profile or ~/.zshrc):
 #
-# gwr () {
-#   local script="/absolute/path/to/gwr.sh"  # UPDATE THIS PATH
+# orchestra () {
+#   local script="/absolute/path/to/orchestra.sh"  # UPDATE THIS PATH
 #   local out
 #   out="$(command bash "$script" "$@")"
 #   local status=$?
@@ -29,7 +29,7 @@ set -o nounset
 # shellcheck shell=bash
 
 ###############################################################################
-# gwr.sh – Git-Worktree Rust TUI launcher
+# orchestra.sh - Orchestra TUI launcher
 ###############################################################################
 
 set -o errexit
@@ -54,11 +54,11 @@ fi
 
 # Check prerequisites
 gwr_check_git_repo
-gwr_check_bridge_script
+gwr_check_services_script
 
 # Find the binary
 if ! BINARY_PATH=$(gwr_find_binary); then
-    gwr_error "gw-tui binary not found!"
+    gwr_error "tui binary not found!"
     gwr_error ""
     gwr_error "Please build the Rust TUI first:"
     gwr_error "  ./build.sh"
@@ -70,61 +70,17 @@ if ! BINARY_PATH=$(gwr_find_binary); then
     if [[ -n "${GW_TUI_BIN:-}" ]]; then
         gwr_error "  • $GW_TUI_BIN (from GW_TUI_BIN)"
     fi
-    gwr_error "  • $SCRIPT_DIR/gw-tui/target/release/gw-tui"
-    gwr_error "  • $SCRIPT_DIR/gw-tui/target/debug/gw-tui"
-    gwr_error "  • gw-tui (in PATH)"
+    gwr_error "  • $SCRIPT_DIR/tui/target/release/tui"
+    gwr_error "  • $SCRIPT_DIR/tui/target/debug/tui"
+    gwr_error "  • tui (in PATH)"
     exit 1
 fi
 
-BRIDGE_PATH="$SCRIPT_DIR/gw-bridge.sh"
+SERVICES_PATH="$SCRIPT_DIR/services.sh"
 
 gwr_set_terminal_title
 
 # Check for updates silently (once per day)
 gwr_check_updates_silent
 
-exec "$BINARY_PATH" --bridge-path "$BRIDGE_PATH" "$@"
-
-# Handle help flag early
-if [[ "${1:-}" == "-h" || "${1:-}" == "--help" ]]; then
-    show_usage
-    exit 0
-fi
-
-# Handle update check flag
-if [[ "${1:-}" == "--check-updates" || "${1:-}" == "--update" ]]; then
-    "$SCRIPT_DIR/shell/gwr/check-updates.sh"
-    exit $?
-fi
-
-# Check prerequisites
-check_git_repo
-check_bridge_script
-
-# Find the binary
-if ! BINARY_PATH=$(find_gw_tui_binary); then
-    error "gw-tui binary not found!"
-    error ""
-    error "Please build the Rust TUI first:"
-    error "  ./build.sh"
-    error ""
-    error "Or install globally:"
-    error "  ./build.sh --install"
-    error ""
-    error "Binary search paths:"
-    if [[ -n "${GW_TUI_BIN:-}" ]]; then
-        error "  • $GW_TUI_BIN (from GW_TUI_BIN)"
-    fi
-    error "  • $SCRIPT_DIR/gw-tui/target/release/gw-tui"
-    error "  • $SCRIPT_DIR/gw-tui/target/debug/gw-tui"
-    error "  • gw-tui (in PATH)"
-    exit 1
-fi
-
-# Get bridge script path
-BRIDGE_PATH="$SCRIPT_DIR/gw-bridge.sh"
-
-set_terminal_title
-
-# Run the Rust TUI with bridge path and all arguments passed through
-exec "$BINARY_PATH" --bridge-path "$BRIDGE_PATH" "$@"
+exec "$BINARY_PATH" --services-path "$SERVICES_PATH" "$@"

package/resources/scripts/{shell/bridge → server/services}/ai.sh

@@ -28,7 +28,7 @@ ai_choose_provider() {
 }
 
 # AI generate name from base64 content
-bridge_ai_generate_name_from_base64() {
+services_ai_generate_name_from_base64() {
   if [[ -z "${1:-}" ]]; then
     json_error "Base64 content required"
     return 1
@@ -147,7 +147,7 @@ PY
 }
 
 # Rename session with AI
-bridge_rename_session() {
+services_rename_session() {
   if [[ -z "${1:-}" ]]; then
     json_error "Session name required"
     return 1
@@ -184,7 +184,7 @@ bridge_rename_session() {
   # Generate AI description using the CURRENT session (no renaming to temp name)
   local err_file
   if [[ "$OSTYPE" == "darwin"* ]]; then
-    err_file=$(mktemp -t gw_ai_err)
+    err_file=$(mktemp -t orchestra_ai_err)
   else
     err_file=$(mktemp)
   fi
@@ -229,7 +229,7 @@ bridge_rename_session() {
 }
 
 # Manual rename session
-bridge_manual_rename_session() {
+services_manual_rename_session() {
   if [[ -z "${1:-}" ]] || [[ $# -lt 2 ]]; then
     json_error "Old and new session names required"
     return 1

package/resources/scripts/{gw-bridge.sh → server/services/dispatch.sh}

@@ -1,11 +1,11 @@
 #!/bin/bash
 
 ###############################################################################
-# gw-bridge.sh – API bridge between the Rust TUI and the shell context
+# services.sh – local services between the Rust TUI and the shell context
 # ---------------------------------------------------------------------------
 # The UI lives in Rust, but all operational logic (git, worktrees, tmux, env
 # copying, etc.) lives in bash.  The TUI calls into this script (through
-# `BridgeApi`), and we fan out to the shell utilities (`api/git.sh`, `commands.sh`,
+# `ServicesApi`), and we fan out to the shell utilities (`api/git.sh`,
 # `api/tmux.sh`, …).  Responses are normalised (usually JSON) so the Rust side can
 # remain strongly-typed while we stay anchored in the shell environment.
 ###############################################################################
@@ -13,29 +13,32 @@
 set -euo pipefail
 
 # Source the API modules
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-source "$SCRIPT_DIR/api/git.sh"
-source "$SCRIPT_DIR/api/tmux.sh"
-source "$SCRIPT_DIR/shell/gw_env_copy.sh"
-
-# Source bridge modules
-source "$SCRIPT_DIR/shell/bridge/utils.sh"
-source "$SCRIPT_DIR/shell/bridge/tmux.sh"
-source "$SCRIPT_DIR/shell/bridge/ai.sh"
-
-# Source git bridge modules (now modular)
-source "$SCRIPT_DIR/shell/git/bridge_worktree.sh"
-source "$SCRIPT_DIR/shell/git/bridge_repo.sh"
-source "$SCRIPT_DIR/shell/git/bridge_merge.sh"
-source "$SCRIPT_DIR/shell/git/bridge_enhanced_git_status.sh"
-source "$SCRIPT_DIR/shell/git/bridge_git_status.sh"
+SERVICES_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+SERVER_DIR="$(cd "$SERVICES_DIR/.." && pwd)"
+ROOT_DIR="$(cd "$SERVER_DIR/.." && pwd)"
+GIT_SERVICES_DIR="$SERVICES_DIR/git"
+source "$GIT_SERVICES_DIR/api.sh"
+source "$ROOT_DIR/api/tmux.sh"
+source "$ROOT_DIR/shell/env_copy.sh"
+
+# Source services modules
+source "$SERVICES_DIR/json.sh"
+source "$SERVICES_DIR/session/tmux.sh"
+source "$SERVICES_DIR/ai.sh"
+
+# Source git service handlers
+source "$GIT_SERVICES_DIR/worktree_api.sh"
+source "$GIT_SERVICES_DIR/repo_api.sh"
+source "$GIT_SERVICES_DIR/merge_api.sh"
+source "$GIT_SERVICES_DIR/enhanced_git_status_api.sh"
+source "$GIT_SERVICES_DIR/git_status_api.sh"
 
 # Define utilities we need
 err() { printf '❌ %s\n' "$*" >&2; }
 info() { printf '%s\n' "$*"; }
 have_cmd() { command -v "$1" >/dev/null 2>&1; }
 
-bridge_copy_env_files() {
+services_copy_env_files() {
   if [[ -z "${1:-}" ]] || [[ -z "${2:-}" ]]; then
     json_error "Source and target paths required"
     return 1
@@ -58,8 +61,8 @@ bridge_copy_env_files() {
   fi
 
   local bin
-  if ! bin="$(gw_env_copy_bin)"; then
-    json_error "gw-env-copy binary not found"
+  if ! bin="$(env_copy_bin)"; then
+    json_error "env-copy binary not found"
     return 1
   fi
 
@@ -78,155 +81,155 @@ bridge_copy_env_files() {
 }
 
 # Ensure JSON backend is available (jq preferred, python/node fallback)
-bridge_init_json_backend
+services_init_json_backend
 
 # Main command dispatcher
 case "${1:-}" in
   "list-worktrees")
-    bridge_list_worktrees
+    list_worktrees_api
     ;;
     
   "list-sessions")
-    bridge_list_sessions "${2:-}" "${3:-}"
+    services_list_sessions "${2:-}" "${3:-}"
     ;;
     
   "create-session")
-    bridge_create_session "${2:-}" "${3:-}" "${4:-}"
+    services_create_session "${2:-}" "${3:-}" "${4:-}"
     ;;
 
   "create-session-exact")
-    bridge_create_session_exact "${2:-}" "${3:-}"
+    services_create_session_exact "${2:-}" "${3:-}"
     ;;
 
   "create-workspace-session")
-    bridge_create_workspace_session "${2:-}" "${3:-}"
+    services_create_workspace_session "${2:-}" "${3:-}"
     ;;
 
   "close-workspace-session")
-    bridge_close_workspace_session "${2:-}" "${3:-}"
+    services_close_workspace_session "${2:-}" "${3:-}"
     ;;
 
   "workspace-session-menu")
-    bridge_workspace_session_menu "${2:-}" "${3:-}"
+    services_workspace_session_menu "${2:-}" "${3:-}"
     ;;
 
   "kill-session")
-    bridge_kill_session "${2:-}"
+    services_kill_session "${2:-}"
     ;;
     
   "attach-session")
-    bridge_attach_session "${2:-}"
+    services_attach_session "${2:-}"
     ;;
   
   "tmux-send-keys")
-    bridge_tmux_send_keys "${2:-}" "${@:3}"
+    services_tmux_send_keys "${2:-}" "${@:3}"
     ;;
 
   "cycle-workspace-session")
-    bridge_cycle_workspace_session "${2:-}" "${3:-}" "${4:-}"
+    services_cycle_workspace_session "${2:-}" "${3:-}" "${4:-}"
     ;;
 
   "tmux-help-popup")
-    bridge_tmux_help_popup "${2:-}"
+    services_tmux_help_popup "${2:-}"
     ;;
     
   "session-metadata")
-    bridge_session_metadata "${2:-}"
+    services_session_metadata "${2:-}"
     ;;
     
   "session-preview")
-    bridge_session_preview "${2:-}"
+    services_session_preview "${2:-}"
     ;;
     
     "ai-generate-name-from-base64")
-    bridge_ai_generate_name_from_base64 "${2:-}"
+    services_ai_generate_name_from_base64 "${2:-}"
     ;;
     
   "rename-session")
-    bridge_rename_session "${2:-}"
+    services_rename_session "${2:-}"
     ;;
     
   "manual-rename-session")
-    bridge_manual_rename_session "${2:-}" "${@:3}"
+    services_manual_rename_session "${2:-}" "${@:3}"
     ;;
     
   "check-branch")
-    bridge_check_branch "${2:-}"
+    check_branch_api "${2:-}"
     ;;
 
   "create-worktree")
-    bridge_create_worktree "${2:-}"
+    create_worktree_api "${2:-}"
     ;;
 
   "create-worktree-from-existing")
-    bridge_create_worktree_from_existing "${2:-}"
+    create_worktree_from_existing_api "${2:-}"
     ;;
 
   "create-worktree-from-remote")
-    bridge_create_worktree_from_remote "${2:-}" "${3:-}"
+    create_worktree_from_remote_api "${2:-}" "${3:-}"
     ;;
 
   "delete-worktree")
-    bridge_delete_worktree "${2:-}"
+    delete_worktree_api "${2:-}"
     ;;
     
   "delete-worktree-only")
-    bridge_delete_worktree_only "${2:-}"
+    delete_worktree_only_api "${2:-}"
     ;;
     
   "delete-branch-only")
-    bridge_delete_branch_only "${2:-}"
+    delete_branch_only_api "${2:-}"
     ;;
     
   "switch-worktree")
-    bridge_switch_worktree "${2:-}"
+    switch_worktree_api "${2:-}"
     ;;
     
   "repo-info")
-    bridge_repo_info
+    repo_info_api
     ;;
     
   "git-status")
-    bridge_git_status
+    git_status_api
     ;;
     
   "enhanced-git-status")
-    bridge_enhanced_git_status "${2:-}"
+    enhanced_git_status_api "${2:-}"
     ;;
     
   "primary-branch")
-    bridge_primary_branch
+    primary_branch_api
     ;;
 
   "merge-from-primary")
-    bridge_merge_from_primary "$@"
+    merge_from_primary_api "$@"
     ;;
 
   "rebase-from-primary")
-    bridge_rebase_from_primary "$@"
+    rebase_from_primary_api "$@"
     ;;
 
   "merge-into-primary")
-    bridge_merge_into_primary "$@"
+    merge_into_primary_api "$@"
     ;;
 
   "squash-into-primary")
-    bridge_squash_into_primary "$@"
+    squash_into_primary_api "$@"
     ;;
 
   "tmux-available")
-    bridge_tmux_available
+    services_tmux_available
     ;;
     
   "copy-env-files")
-    bridge_copy_env_files "${2:-}" "${3:-}" "${4:-}"
+    services_copy_env_files "${2:-}" "${3:-}" "${4:-}"
     ;;
     
   "help"|"-h"|"--help")
     cat << 'EOF'
-Usage: gw-bridge.sh <command> [args]
+Usage: services.sh <command> [args]
 
-API bridge for gw-tui Rust application.
+Local services for the tui Rust application.
 
 Commands:
   list-worktrees                    List all worktrees as JSON