@humanu/orchestra 0.5.77 → 0.5.78

package/resources/scripts/server/services/git/api.sh

@@ -0,0 +1,447 @@
+#!/bin/bash
+
+###############################################################################
+# git.sh – Git Worktree API Module
+# ---------------------------------------------------------------------------
+# This module provides a centralized API for all Git operations used by
+# orchestra-cli.sh and services.sh. It abstracts Git worktree management
+# and other Git operations into a clean, consistent interface.
+###############################################################################
+
+# --------------------------- Repository Information -------------------------
+
+# Get the Git repository root directory
+git_repo_root() {
+  git rev-parse --show-toplevel 2>/dev/null || true
+}
+
+# Check if current directory is in a Git repository
+git_is_repo() {
+  git rev-parse --git-dir >/dev/null 2>&1
+}
+
+# Get current absolute path (resolved)
+git_current_path() {
+  pwd -P
+}
+
+# Get the primary repository root (shared across all worktrees)
+git_shared_root() {
+  local common_dir
+  common_dir="$(git rev-parse --git-common-dir 2>/dev/null)" || return 1
+  if [[ -z "$common_dir" ]]; then
+    return 1
+  fi
+  if [[ "$common_dir" != /* ]]; then
+    common_dir="$(pwd -P)/$common_dir"
+  fi
+  dirname "$common_dir"
+}
+
+# Convert branch name to slug (replace / with -)
+git_branch_to_slug() {
+  echo "$1" | tr '/' '-'
+}
+
+# --------------------------- Branch Operations ------------------------------
+
+# Check if a branch exists
+git_branch_exists() {
+  local branch_name="$1"
+  git rev-parse --verify "$branch_name" >/dev/null 2>&1
+}
+
+# Get current branch name (or empty if detached HEAD)
+git_current_branch() {
+  git symbolic-ref --short HEAD 2>/dev/null || true
+}
+
+# Get current commit SHA (short format)
+git_current_commit_short() {
+  git rev-parse --short HEAD 2>/dev/null || true
+}
+
+# Delete a local branch (force delete)
+git_delete_branch() {
+  local branch_name="$1"
+  git branch -D "$branch_name" 2>/dev/null || true
+}
+
+# --------------------------- Worktree Operations ----------------------------
+
+# Ensure ignore rules for worktrees directory exist in both .gitignore and .git/info/exclude
+# Non-destructive and idempotent; creates files if needed
+git_ensure_ignore_worktrees() {
+  local root; root="$(git_repo_root)"
+  [[ -z "$root" ]] && return 1
+
+  # .git/info/exclude (local-only)
+  local exclude_file="$root/.git/info/exclude"
+  mkdir -p "$root/.git/info" 2>/dev/null || true
+  if [[ -f "$exclude_file" ]]; then
+    if ! grep -q -E '^worktrees/(\s*)?$' "$exclude_file" 2>/dev/null; then
+      echo 'worktrees/' >> "$exclude_file"
+    fi
+  else
+    echo 'worktrees/' >> "$exclude_file"
+  fi
+
+  # Top-level .gitignore (shared)
+  local gi_file="$root/.gitignore"
+  if [[ -f "$gi_file" ]]; then
+    if ! grep -q -E '^worktrees/(\s*)?$' "$gi_file" 2>/dev/null; then
+      echo 'worktrees/' >> "$gi_file"
+    fi
+  else
+    echo 'worktrees/' > "$gi_file"
+  fi
+}
+
+# List all worktrees: returns lines with "path\tbranch\tsha_short"
+git_list_worktrees() {
+  local root; root="$(git_repo_root)"
+  [[ -z "$root" ]] && return 1
+
+  local current_path=""
+  local current_branch=""
+  local current_head=""
+
+  while IFS= read -r line || [[ -n "$line" ]]; do
+    case "$line" in
+      worktree\ *)
+        current_path="${line#worktree }"
+        ;;
+      HEAD\ *)
+        current_head="${line#HEAD }"
+        ;;
+      branch\ *)
+        current_branch="${line#branch }"
+        if [[ "$current_branch" == refs/heads/* ]]; then
+          current_branch="${current_branch#refs/heads/}"
+        fi
+        ;;
+      *)
+        ;;
+    esac
+
+    if [[ -z "$line" ]]; then
+      if [[ -n "$current_path" ]]; then
+        printf '%s\t%s\t%s\n' "$current_path" "$current_branch" "${current_head:0:7}"
+      fi
+      current_path=""
+      current_branch=""
+      current_head=""
+    fi
+  done < <(cd "$root" && git worktree list --porcelain)
+
+  if [[ -n "$current_path" ]]; then
+    printf '%s\t%s\t%s\n' "$current_path" "$current_branch" "${current_head:0:7}"
+  fi
+}
+
+# Get branch name for a given worktree path
+git_worktree_path_to_branch() {
+  local path="$1"
+  local root; root="$(git_repo_root)"
+  [[ -z "$root" ]] && return 1
+
+  local current_path=""
+  local current_branch=""
+
+  while IFS= read -r line || [[ -n "$line" ]]; do
+    case "$line" in
+      worktree\ *)
+        current_path="${line#worktree }"
+        ;;
+      branch\ *)
+        current_branch="${line#branch }"
+        if [[ "$current_branch" == refs/heads/* ]]; then
+          current_branch="${current_branch#refs/heads/}"
+        fi
+        ;;
+      *)
+        ;;
+    esac
+
+    if [[ -z "$line" ]]; then
+      if [[ "$current_path" == "$path" ]]; then
+        printf '%s\n' "$current_branch"
+        return 0
+      fi
+      current_path=""
+      current_branch=""
+    fi
+  done < <(cd "$root" && git worktree list --porcelain)
+
+  return 1
+}
+
+# Get worktree path for a given branch name
+git_branch_to_worktree_path() {
+  local branch_name="$1"
+  local root; root="$(git_repo_root)"
+  [[ -z "$root" ]] && return 1
+
+  local current_path=""
+  local current_branch=""
+
+  while IFS= read -r line || [[ -n "$line" ]]; do
+    case "$line" in
+      worktree\ *)
+        current_path="${line#worktree }"
+        ;;
+      branch\ *)
+        current_branch="${line#branch }"
+        if [[ "$current_branch" == refs/heads/* ]]; then
+          current_branch="${current_branch#refs/heads/}"
+        fi
+        ;;
+      *)
+        ;;
+    esac
+
+    if [[ -z "$line" ]]; then
+      if [[ "$current_branch" == "$branch_name" ]]; then
+        printf '%s\n' "$current_path"
+        return 0
+      fi
+      current_path=""
+      current_branch=""
+    fi
+  done < <(cd "$root" && git worktree list --porcelain)
+
+  return 1
+}
+
+# Create a new worktree with a new branch
+git_create_worktree_with_branch() {
+  local branch_name="$1"
+  local worktree_path="$2"
+  local root; root="$(git_repo_root)"
+  [[ -z "$root" ]] && return 1
+
+  local relative_path="${worktree_path#$root/}"
+  (cd "$root" && git worktree add "$relative_path" -b "$branch_name" >&2)
+}
+
+# Create a new worktree from existing branch
+git_create_worktree_from_branch() {
+  local branch_name="$1"
+  local worktree_path="$2"
+  local root; root="$(git_repo_root)"
+  [[ -z "$root" ]] && return 1
+
+  local relative_path="${worktree_path#$root/}"
+  (cd "$root" && git worktree add "$relative_path" "$branch_name" >&2)
+}
+
+git_create_worktree_for_existing_branch() {
+  local branch_name="$1"
+  local root; root="$(git_repo_root)"
+  [[ -z "$root" ]] && return 1
+
+  git_branch_exists "$branch_name" || { echo "Branch does not exist: $branch_name" >&2; return 1; }
+
+  git_ensure_ignore_worktrees >/dev/null 2>&1 || true
+
+  local worktree_path; worktree_path="$(git_build_worktree_path "$branch_name")"
+  mkdir -p "$(dirname "$worktree_path")"
+
+  git_create_worktree_from_branch "$branch_name" "$worktree_path" || return 1
+
+  echo "$worktree_path"
+}
+
+git_create_worktree_from_remote_branch() {
+  local branch_name="$1"
+  local remote_name="${2:-origin}"
+  local root; root="$(git_repo_root)"
+  [[ -z "$root" ]] && return 1
+
+  git_ensure_ignore_worktrees >/dev/null 2>&1 || true
+
+  local worktree_path; worktree_path="$(git_build_worktree_path "$branch_name")"
+  mkdir -p "$(dirname "$worktree_path")"
+
+  local relative_path="${worktree_path#$root/}"
+  (cd "$root" && git worktree add "$relative_path" -b "$branch_name" "$remote_name/$branch_name" >&2) || return 1
+
+  echo "$worktree_path"
+}
+
+# Remove a worktree (with force fallback)
+git_remove_worktree() {
+  local worktree_path="$1"
+  local root; root="$(git_repo_root)"
+  [[ -z "$root" ]] && return 1
+
+  local relative_path="${worktree_path#$root/}"
+  (cd "$root" && {
+    git worktree remove "$relative_path" 2>/dev/null || \
+    git worktree remove --force "$relative_path" 2>/dev/null || true
+  })
+}
+
+# Get Git status for current directory
+git_status() {
+  git status "$@"
+}
+
+# Get short Git status for current directory
+git_status_short() {
+  git status --short
+}
+
+# --------------------------- Worktree Path Utilities ------------------------
+
+# Build standard worktree path for a branch
+git_build_worktree_path() {
+  local branch_name="$1"
+  local root; root="$(git_repo_root)"
+  [[ -z "$root" ]] && return 1
+
+  local slug; slug="$(git_branch_to_slug "$branch_name")"
+  echo "$root/worktrees/$slug"
+}
+
+# Check if a worktree exists for a branch
+git_worktree_exists_for_branch() {
+  local branch_name="$1"
+  local path; path="$(git_branch_to_worktree_path "$branch_name")"
+  [[ -n "$path" ]]
+}
+
+# Get or create worktree path for a branch
+git_ensure_worktree_for_branch() {
+  local branch_name="$1"
+  local root; root="$(git_repo_root)"
+  [[ -z "$root" ]] && return 1
+
+  # Check if worktree already exists
+  local existing_path; existing_path="$(git_branch_to_worktree_path "$branch_name")"
+  if [[ -n "$existing_path" ]]; then
+    echo "$existing_path"
+    return 0
+  fi
+
+  # Create worktree if branch exists
+  if git_branch_exists "$branch_name"; then
+    # Ensure ignores before creating worktree
+    git_ensure_ignore_worktrees >/dev/null 2>&1 || true
+    local worktree_path; worktree_path="$(git_build_worktree_path "$branch_name")"
+    mkdir -p "$(dirname "$worktree_path")"
+    git_create_worktree_from_branch "$branch_name" "$worktree_path"
+    echo "$worktree_path"
+    return 0
+  fi
+
+  return 1
+}
+
+# Create new branch and worktree
+git_create_branch_and_worktree() {
+  local branch_name="$1"
+  local root; root="$(git_repo_root)"
+  [[ -z "$root" ]] && return 1
+
+  # Ensure ignores before creating worktree
+  git_ensure_ignore_worktrees >/dev/null 2>&1 || true
+  local worktree_path; worktree_path="$(git_build_worktree_path "$branch_name")"
+  mkdir -p "$(dirname "$worktree_path")"
+  git_create_worktree_with_branch "$branch_name" "$worktree_path"
+  echo "$worktree_path"
+}
+
+# --------------------------- Validation Functions ---------------------------
+
+# Validate that we're in a Git repository
+git_require_repo() {
+  git_is_repo || { echo "❌ Not a git repository or git command not found." >&2; return 1; }
+}
+
+# Get repository root with validation
+git_require_repo_root() {
+  local root; root="$(git_repo_root)"
+  [[ -z "$root" ]] && { echo "❌ Not a git repository" >&2; return 1; }
+  echo "$root"
+}
+
+# --------------------------- Merge/Rebase Helpers ----------------------------
+
+# Detect the primary branch name (default remote HEAD), fall back to common names
+# Echoes the branch name on success; returns non-zero on failure
+git_primary_branch() {
+  local head_ref branch
+  # Try origin/HEAD symbolic ref
+  head_ref=$(git symbolic-ref refs/remotes/origin/HEAD 2>/dev/null || true)
+  if [[ -n "$head_ref" ]]; then
+    # refs/remotes/origin/main -> extract last component
+    branch="${head_ref##*/}"
+    [[ -n "$branch" ]] && { echo "$branch"; return 0; }
+  fi
+  # Try parsing `git remote show origin`
+  branch=$(git remote show origin 2>/dev/null | awk -F': ' '/HEAD branch/ {print $2; exit}')
+  if [[ -n "$branch" && "$branch" != "(unknown)" ]]; then
+    echo "$branch"; return 0
+  fi
+  # Fallback candidates
+  for cand in main master trunk; do
+    if git rev-parse --verify "$cand" >/dev/null 2>&1 || git rev-parse --verify "origin/$cand" >/dev/null 2>&1; then
+      echo "$cand"; return 0
+    fi
+  done
+  return 1
+}
+
+# Check if a worktree at path is clean (no changes)
+# Usage: git_is_worktree_clean <path>
+git_is_worktree_clean() {
+  local path="$1"
+  [[ -z "$path" ]] && return 1
+  local out
+  out=$(git -C "$path" status --porcelain 2>/dev/null || true)
+  [[ -z "$out" ]]
+}
+
+# Fetch from origin with prune for a given path
+git_fetch_prune() {
+  local path="$1"
+  git -C "$path" fetch origin --prune 2>&1
+}
+
+# Fast-forward-only pull for the currently checked out branch at path
+# Returns non-zero if not a fast-forward
+# Usage: git_pull_ff_only <path>
+git_pull_ff_only() {
+  local path="$1"
+  git -C "$path" pull --ff-only 2>&1
+}
+
+# Merge a ref into the currently checked out branch at target path
+# Usage: git_merge_into <target_path> <ref>
+git_merge_into() {
+  local target="$1"; local ref="$2"
+  git -C "$target" merge "$ref" 2>&1
+}
+
+# Rebase the current branch at target path onto upstream ref
+# Usage: git_rebase_onto <target_path> <upstream_ref>
+git_rebase_onto() {
+  local target="$1"; local upstream="$2"
+  git -C "$target" rebase "$upstream" 2>&1
+}
+
+# Squash-merge branch into the primary worktree path, then commit if changes staged
+# Usage: git_squash_merge_into <primary_path> <branch>
+git_squash_merge_into() {
+  local primary_path="$1"; local branch="$2"
+  git -C "$primary_path" merge --squash "$branch" 2>&1
+}
+
+# Ensure a primary worktree exists; echoes the path
+# Usage: git_ensure_primary_worktree
+git_ensure_primary_worktree() {
+  local primary
+  primary=$(git_primary_branch) || return 1
+  git_ensure_worktree_for_branch "$primary"
+}

package/resources/scripts/{shell/git/bridge_check_branch.sh → server/services/git/check_branch_api.sh}

@@ -3,7 +3,7 @@
 # shellcheck shell=bash
 
 # Check branch existence
-bridge_check_branch() {
+check_branch_api() {
   if [[ -z "${1:-}" ]]; then
     json_error "Branch name required"
     return 1

package/resources/scripts/{shell/git/bridge_create_worktree.sh → server/services/git/create_worktree_api.sh}

@@ -3,7 +3,7 @@
 # shellcheck shell=bash
 
 # Create worktree
-bridge_create_worktree() {
+create_worktree_api() {
   if [[ -z "${1:-}" ]]; then
     json_error "Branch name required"
     return 1
@@ -26,8 +26,8 @@ bridge_create_worktree() {
     fi
 
     local env_copy_bin
-    if ! env_copy_bin="$(gw_env_copy_bin)"; then
-      json_error "gw-env-copy binary not found"
+    if ! env_copy_bin="$(env_copy_bin)"; then
+      json_error "env-copy binary not found"
       return 1
     fi
 

package/resources/scripts/{shell/git/bridge_create_worktree_from_existing.sh → server/services/git/create_worktree_from_existing_api.sh}

@@ -3,7 +3,7 @@
 # shellcheck shell=bash
 
 # Create worktree from existing branch
-bridge_create_worktree_from_existing() {
+create_worktree_from_existing_api() {
   if [[ -z "${1:-}" ]]; then
     json_error "Branch name required"
     return 1
@@ -29,4 +29,4 @@ bridge_create_worktree_from_existing() {
   else
     json_error "Not a git repository"
   fi
-}
+}

package/resources/scripts/{shell/git/bridge_create_worktree_from_remote.sh → server/services/git/create_worktree_from_remote_api.sh}

@@ -3,7 +3,7 @@
 # shellcheck shell=bash
 
 # Create worktree from remote branch
-bridge_create_worktree_from_remote() {
+create_worktree_from_remote_api() {
   if [[ -z "${1:-}" ]]; then
     json_error "Branch name required"
     return 1
@@ -25,4 +25,4 @@ bridge_create_worktree_from_remote() {
   else
     json_error "Not a git repository"
   fi
-}
+}

package/resources/scripts/{shell/git/bridge_delete_branch_only.sh → server/services/git/delete_branch_only_api.sh}

@@ -3,7 +3,7 @@
 # shellcheck shell=bash
 
 # Delete branch only
-bridge_delete_branch_only() {
+delete_branch_only_api() {
   if [[ -z "${1:-}" ]]; then
     json_error "Branch name required"
     return 1

package/resources/scripts/{shell/git/bridge_delete_worktree.sh → server/services/git/delete_worktree_api.sh}

@@ -3,7 +3,7 @@
 # shellcheck shell=bash
 
 # Delete worktree and branch
-bridge_delete_worktree() {
+delete_worktree_api() {
   if [[ -z "${1:-}" ]]; then
     json_error "Branch name required"
     return 1
@@ -23,4 +23,4 @@ bridge_delete_worktree() {
   else
     json_error "Not a git repository"
   fi
-}
+}

package/resources/scripts/{shell/git/bridge_delete_worktree_only.sh → server/services/git/delete_worktree_only_api.sh}

@@ -3,7 +3,7 @@
 # shellcheck shell=bash
 
 # Delete worktree only
-bridge_delete_worktree_only() {
+delete_worktree_only_api() {
   if [[ -z "${1:-}" ]]; then
     json_error "Branch name required"
     return 1

package/resources/scripts/{shell/git/bridge_enhanced_git_status.sh → server/services/git/enhanced_git_status_api.sh}

@@ -3,7 +3,7 @@
 # shellcheck shell=bash
 
 # Get enhanced git status
-bridge_enhanced_git_status() {
+enhanced_git_status_api() {
   # Optional directory parameter - if provided, cd to that directory first
   target_dir="${1:-}"
   if [[ -n "$target_dir" ]]; then
@@ -48,7 +48,7 @@ bridge_enhanced_git_status() {
         # Check for staged changes first
         if [[ "$index_status" != " " && "$index_status" != "?" ]]; then
           # Look up stats in bulk staged diff
-          stats="$(echo "$staged_stats" | grep -F "	$filepath" | head -1)"
+          stats="$(echo "$staged_stats" | grep -F "	$filepath" | head -1 || true)"
           if [[ -n "$stats" && "$stats" != "-	-"* ]]; then
             added="$(echo "$stats" | cut -f1)"
             deleted="$(echo "$stats" | cut -f2)"
@@ -61,7 +61,7 @@ bridge_enhanced_git_status() {
         # Check for working directory changes if no staged stats or if workdir is also modified
         if [[ "$workdir_status" != " " && "$workdir_status" != "?" ]] && [[ $added -eq 0 && $deleted -eq 0 ]]; then
           # Look up stats in bulk unstaged diff
-          stats="$(echo "$unstaged_stats" | grep -F "	$filepath" | head -1)"
+          stats="$(echo "$unstaged_stats" | grep -F "	$filepath" | head -1 || true)"
           if [[ -n "$stats" && "$stats" != "-	-"* ]]; then
             added="$(echo "$stats" | cut -f1)"
             deleted="$(echo "$stats" | cut -f2)"

package/resources/scripts/{shell/git/bridge_git_status.sh → server/services/git/git_status_api.sh}

@@ -3,11 +3,11 @@
 # shellcheck shell=bash
 
 # Get git status
-bridge_git_status() {
+git_status_api() {
   if git_require_repo_root >/dev/null 2>&1; then
     status_output="$(git status --porcelain 2>/dev/null || echo "")"
     echo "\"$status_output\""
   else
     json_error "Not a git repository"
   fi
-}
+}

package/resources/scripts/{shell/git/bridge_list_worktrees.sh → server/services/git/list_worktrees_api.sh}

@@ -3,10 +3,10 @@
 # shellcheck shell=bash
 
 # List worktrees as JSON
-bridge_list_worktrees() {
+list_worktrees_api() {
   if git_require_repo_root >/dev/null 2>&1; then
     json_worktrees
   else
     json_error "Not a git repository"
   fi
-}
+}

package/resources/scripts/server/services/git/merge_api.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# shellcheck shell=bash
+
+# Master file that sources all individual services 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_api.sh"
+source "$(dirname "${BASH_SOURCE[0]}")/rebase_from_primary_api.sh"
+source "$(dirname "${BASH_SOURCE[0]}")/merge_into_primary_api.sh"
+source "$(dirname "${BASH_SOURCE[0]}")/squash_into_primary_api.sh"

package/resources/scripts/{shell/git/bridge_merge_from_primary.sh → server/services/git/merge_from_primary_api.sh}

@@ -3,7 +3,7 @@
 # shellcheck shell=bash
 
 # Merge from primary
-bridge_merge_from_primary() {
+merge_from_primary_api() {
   # Parse args: --worktree <path> --branch <name>
   shift || true
   wt=""; br=""

package/resources/scripts/{shell/git/bridge_merge_into_primary.sh → server/services/git/merge_into_primary_api.sh}

@@ -3,7 +3,7 @@
 # shellcheck shell=bash
 
 # Merge into primary
-bridge_merge_into_primary() {
+merge_into_primary_api() {
   shift || true
   wt=""; br=""; msg=""
   while [[ $# -gt 0 ]]; do

package/resources/scripts/{shell/git/bridge_primary_branch.sh → server/services/git/primary_branch_api.sh}

@@ -3,7 +3,7 @@
 # shellcheck shell=bash
 
 # Get primary branch
-bridge_primary_branch() {
+primary_branch_api() {
   if pr=$(git_primary_branch); then
     json_object "ok:b=true" "primary:s=$pr"
   else

package/resources/scripts/{shell/git/bridge_rebase_from_primary.sh → server/services/git/rebase_from_primary_api.sh}

@@ -3,7 +3,7 @@
 # shellcheck shell=bash
 
 # Rebase from primary
-bridge_rebase_from_primary() {
+rebase_from_primary_api() {
   shift || true
   wt=""; br=""
   while [[ $# -gt 0 ]]; do

package/resources/scripts/server/services/git/repo_api.sh

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

package/resources/scripts/{shell/git/bridge_repo_info.sh → server/services/git/repo_info_api.sh}

@@ -3,7 +3,7 @@
 # shellcheck shell=bash
 
 # Get repository information
-bridge_repo_info() {
+repo_info_api() {
   if git_require_repo_root >/dev/null 2>&1; then
     root="$(git_repo_root)"
     current_path="$(git_current_path)"

package/resources/scripts/{shell/git/bridge_squash_into_primary.sh → server/services/git/squash_into_primary_api.sh}

@@ -3,7 +3,7 @@
 # shellcheck shell=bash
 
 # Squash into primary
-bridge_squash_into_primary() {
+squash_into_primary_api() {
   shift || true
   wt=""; br=""; msg=""
   while [[ $# -gt 0 ]]; do