@humanu/orchestra 0.5.19 → 0.5.21

package/install.js

@@ -5,7 +5,7 @@ const fs = require('fs');
 const path = require('path');
 
 const BINARY_NAME = 'orchestra';
-const SHELL_SCRIPTS = ['gwr.sh', 'gw.sh', 'gw-bridge.sh', 'commands.sh', 'orchestra-local.sh'];
+const SHELL_SCRIPTS = ['gwr.sh', 'gw.sh', 'gw-bridge.sh', 'commands.sh', 'copy_env.sh', 'orchestra-local.sh'];
 const SUPPORTED_PLATFORMS = {
   'darwin-x64': 'macos-intel',
   'darwin-arm64': 'macos-arm64',

package/package.json

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

package/resources/api/git.sh

@@ -25,6 +25,19 @@ 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 '/' '-'
@@ -88,14 +101,42 @@ git_ensure_ignore_worktrees() {
 git_list_worktrees() {
   local root; root="$(git_repo_root)"
   [[ -z "$root" ]] && return 1
-  
-  (cd "$root" && git worktree list) | awk '
-    {
-      p=""; for (i=1; i<=NF-2; i++) p=(p==""?$i:p" " $i);
-      sha_full=$(NF-1); sha=substr(sha_full,1,7);
-      b=$NF; gsub(/^\[|\]$/, "", b);
-      print p "\t" b "\t" sha;
-    }'
+
+  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
@@ -103,13 +144,36 @@ git_worktree_path_to_branch() {
   local path="$1"
   local root; root="$(git_repo_root)"
   [[ -z "$root" ]] && return 1
-  
-  (cd "$root" && git worktree list) | awk -v target="$path" '
-    {
-      p=""; for (i=1; i<=NF-2; i++) p=(p==""?$i:p" " $i);
-      b=$NF; gsub(/^\[|\]$/, "", b);
-      if (p==target) {print b; exit}
-    }'
+
+  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
@@ -117,12 +181,36 @@ git_branch_to_worktree_path() {
   local branch_name="$1"
   local root; root="$(git_repo_root)"
   [[ -z "$root" ]] && return 1
-  
-  (cd "$root" && git worktree list) | awk -v target="[$branch_name]" '
-    {
-      p=""; for (i=1; i<=NF-2; i++) p=(p==""?$i:p" " $i);
-      if ($NF==target) {print p; exit}
-    }'
+
+  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

package/resources/scripts/commands.sh

@@ -13,39 +13,11 @@ if ! declare -f git_repo_root >/dev/null 2>&1; then
   return 1 2>/dev/null || exit 1
 fi
 
-# --------------------------- Command Functions ------------------------------
+# Source shared copy helpers
+COMMANDS_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "$COMMANDS_DIR/copy_env.sh"
 
-# Copy .env files from source to target worktree
-copy_env_files() {
-    local source_root="$1"
-    local target_root="$2"
-    echo "🔧 Copying .env files to new worktree..."
-    if [ -f "$source_root/.env" ]; then
-        cp "$source_root/.env" "$target_root/.env" && echo "   ✅ Copied .env from root"
-    fi
-    if [ -d "$source_root/nodejs" ]; then
-        mkdir -p "$target_root/nodejs"
-        for env_file in "$source_root/nodejs"/.env*; do
-            [ -f "$env_file" ] || continue
-            cp "$env_file" "$target_root/nodejs/$(basename "$env_file")" && echo "   ✅ Copied $(basename "$env_file") from nodejs/"
-        done
-    fi
-    if [ -d "$source_root/nextjs" ]; then
-        mkdir -p "$target_root/nextjs"
-        for env_file in "$source_root/nextjs"/.env*; do
-            [ -f "$env_file" ] || continue
-            cp "$env_file" "$target_root/nextjs/$(basename "$env_file")" && echo "   ✅ Copied $(basename "$env_file") from nextjs/"
-        done
-    fi
-    if [ -d "$source_root/ingest_py" ]; then
-        mkdir -p "$target_root/ingest_py"
-        for env_file in "$source_root/ingest_py"/.env*; do
-            [ -f "$env_file" ] || continue
-            cp "$env_file" "$target_root/ingest_py/$(basename "$env_file")" && echo "   ✅ Copied $(basename "$env_file") from ingest_py/"
-        done
-    fi
-    echo "🔧 Environment files copied successfully!"; echo ""
-}
+# --------------------------- Command Functions ------------------------------
 
 # Create branch + worktree
 cmd_create_worktree() {
@@ -56,12 +28,15 @@ cmd_create_worktree() {
     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 "$root" "$dir"
+    copy_env_files "$source_root" "$dir" "$shared_root"
     info "✅ Success! Worktree created at '$dir'."
     echo "cd \"$dir\""
     (cd "$dir" && git_status_short)
@@ -121,6 +96,9 @@ 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; }
@@ -144,7 +122,7 @@ cmd_checkout_worktree() {
                 # Create worktree for existing branch
                 info "🌳 Creating worktree for existing branch '$branch_name'..."
                 wt="$(git_ensure_worktree_for_branch "$branch_name")"
-                copy_env_files "$root" "$wt"
+                copy_env_files "$source_root" "$wt" "$shared_root"
                 echo "cd \"$wt\""
             fi
             return 0
@@ -166,12 +144,12 @@ cmd_checkout_worktree() {
             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 "$root" "$wt"
+            copy_env_files "$source_root" "$wt" "$shared_root"
             echo "cd \"$wt\""
             return 0
         else
@@ -220,8 +198,11 @@ cmd_copy_env() {
         return 1
     fi
     
-    local source_root; source_root="$(git_current_path)"
+    local root; root="$(git_repo_root)"
+    local shared_root; shared_root="$(git_shared_root 2>/dev/null)"
+    [[ -z "$shared_root" ]] && shared_root="$root"
+    local source_root="$root"
     info "🔧 Copying env files from '$source_root' -> '$target_path'"
-    copy_env_files "$source_root" "$target_path"
+    copy_env_files "$source_root" "$target_path" "$shared_root"
     info "✅ Env files synced to '$target_branch'"
-}
+}

package/resources/scripts/gw-bridge.sh

@@ -1,10 +1,13 @@
 #!/bin/bash
 
 ###############################################################################
-# gw-bridge.sh – API bridge between Rust TUI and bash APIs
+# gw-bridge.sh – API bridge between the Rust TUI and the shell context
 # ---------------------------------------------------------------------------
-# This script sources the existing git.sh and tmux.sh APIs and exposes them
-# via a JSON interface for the Rust TUI application to consume.
+# 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`,
+# `api/tmux.sh`, …).  Responses are normalised (usually JSON) so the Rust side can
+# remain strongly-typed while we stay anchored in the shell environment.
 ###############################################################################
 
 set -euo pipefail
@@ -13,6 +16,7 @@ set -euo pipefail
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 source "$SCRIPT_DIR/api/git.sh"
 source "$SCRIPT_DIR/api/tmux.sh"
+source "$SCRIPT_DIR/commands.sh"
 
 # Define utilities we need
 err() { printf '❌ %s\n' "$*" >&2; }
@@ -492,6 +496,22 @@ PY
     
     if git_require_repo_root >/dev/null 2>&1; then
       worktree_path="$(git_create_branch_and_worktree "$branch_name")"
+      
+      source_path="$(git_repo_root)"
+      target_path="$worktree_path"
+      shared_root="$(cd "$source_path" 2>/dev/null && git rev-parse --git-common-dir 2>/dev/null || echo "")"
+      if [[ -n "$shared_root" ]]; then
+        if [[ "$shared_root" != /* ]]; then
+          shared_root="$(cd "$source_path" 2>/dev/null && pwd -P)/$shared_root"
+        fi
+        shared_root="$(dirname "$shared_root")"
+      else
+        shared_root="$(cd "$source_path" 2>/dev/null && git rev-parse --show-toplevel 2>/dev/null || printf '%s' "$source_path")"
+      fi
+
+      copy_env_files "$source_path" "$target_path" "$shared_root" 1 >/dev/null
+      shopt -u nullglob
+      
       echo "\"$worktree_path\""
     else
       json_error "Not a git repository"
@@ -629,17 +649,20 @@ PY
       current_path="$(git_current_path)"
       current_branch="$(git_current_branch)"
       current_commit="$(git_current_commit_short)"
+      shared_root="$(git_shared_root 2>/dev/null || echo "$root")"
       
       jq -n \
         --arg root "$root" \
         --arg current_path "$current_path" \
         --arg current_branch "$current_branch" \
         --arg current_commit "$current_commit" \
+        --arg shared_root "$shared_root" \
         '{
           root: $root,
           current_path: $current_path,
           current_branch: $current_branch,
-          current_commit: $current_commit
+          current_commit: $current_commit,
+          shared_root: $shared_root
         }'
     else
       json_error "Not a git repository"
@@ -1087,43 +1110,27 @@ PY
     fi
     source_path="$2"
     target_path="$3"
-    
-    # Copy .env files using the same logic as commands.sh
-    copy_success=0
-    
-    # Copy root .env file
-    if [[ -f "$source_path/.env" ]]; then
-      cp "$source_path/.env" "$target_path/.env" 2>/dev/null && copy_success=1
-    fi
-    
-    # Copy nodejs .env files
-    if [[ -d "$source_path/nodejs" ]]; then
-      mkdir -p "$target_path/nodejs"
-      for env_file in "$source_path/nodejs"/.env*; do
-        [[ -f "$env_file" ]] || continue
-        cp "$env_file" "$target_path/nodejs/$(basename "$env_file")" 2>/dev/null && copy_success=1
-      done
-    fi
-    
-    # Copy nextjs .env files
-    if [[ -d "$source_path/nextjs" ]]; then
-      mkdir -p "$target_path/nextjs"
-      for env_file in "$source_path/nextjs"/.env*; do
-        [[ -f "$env_file" ]] || continue
-        cp "$env_file" "$target_path/nextjs/$(basename "$env_file")" 2>/dev/null && copy_success=1
-      done
+    raw_locations="${4-}"
+
+    repo_root="$(cd "$source_path" 2>/dev/null && git rev-parse --show-toplevel 2>/dev/null || printf '%s' "$source_path")"
+    shared_root="$(cd "$source_path" 2>/dev/null && git rev-parse --git-common-dir 2>/dev/null || echo "")"
+    if [[ -n "$shared_root" ]]; then
+      if [[ "$shared_root" != /* ]]; then
+        shared_root="$(cd "$source_path" 2>/dev/null && pwd -P)/$shared_root"
+      fi
+      shared_root="$(dirname "$shared_root")"
+    else
+      shared_root="$repo_root"
     fi
-    
-    # Copy ingest_py .env files
-    if [[ -d "$source_path/ingest_py" ]]; then
-      mkdir -p "$target_path/ingest_py"
-      for env_file in "$source_path/ingest_py"/.env*; do
-        [[ -f "$env_file" ]] || continue
-        cp "$env_file" "$target_path/ingest_py/$(basename "$env_file")" 2>/dev/null && copy_success=1
-      done
+
+    if [[ -n "$raw_locations" ]]; then
+      override_list="$(printf '%s' "$raw_locations" | jq -r '.[]' 2>/dev/null || printf '/\n')"
+    else
+      override_list=""
     fi
-    
-    if [[ $copy_success -eq 1 ]]; then
+
+    COPY_ENV_OVERRIDE_LOCATIONS="$override_list" copy_env_files "$source_path" "$target_path" "$shared_root" 1 >/dev/null
+    if [[ ${COPY_ENV_LAST_COPIED:-0} -gt 0 ]]; then
       echo "true"
     else
       echo "false"

package/resources/scripts/gw.sh

@@ -71,6 +71,46 @@ else
   exit 1
 fi
 
+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"
+}
+
+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="$(get_current_worktree_title)"
+  printf '\033]0;%s\007' "$title" >"$tty_device" 2>/dev/null || true
+}
+
 # Interactive functionality is provided by the Rust TUI (gw-tui)
 # No longer sourcing interactive.sh - Rust TUI is the primary interface
 
@@ -107,12 +147,15 @@ if [ $# -eq 0 ]; then
   # Interactive mode by default - prefer Rust TUI if available
   if command -v gw-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
     # 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
     # Use debug build of Rust TUI
+    set_terminal_title
     "$SCRIPT_DIR/gw-tui/target/debug/gw-tui" --bridge-path "$SCRIPT_DIR/gw-bridge.sh"
   else
     # No Rust TUI available - provide clear guidance

package/resources/scripts/gwr.sh

@@ -75,6 +75,46 @@ check_git_repo() {
     fi
 }
 
+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"
+}
+
+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="$(get_current_worktree_title)"
+    printf '\033]0;%s\007' "$title" >"$tty_device" 2>/dev/null || true
+}
+
 # Function to check if bridge script exists
 check_bridge_script() {
     local bridge_path="$SCRIPT_DIR/gw-bridge.sh"
@@ -167,5 +207,7 @@ 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" "$@"