@humanu/orchestra 0.5.49 → 0.5.53

package/README.md

@@ -16,6 +16,7 @@ npm install -g @humanu/orchestra
 
 ```bash
 orchestra  # Launch the Rust TUI
+orchestra upgrade  # Check for available updates
 ```
 
 For full documentation and release notes, visit https://github.com/humanunsupervised/orchestra

package/bin/orchestra.js

@@ -4,7 +4,10 @@ const path = require('path');
 const { spawnSync } = require('child_process');
 
 const installScript = path.join(__dirname, '..', 'install.js');
-const result = spawnSync(process.execPath, [installScript, '--invoke=orchestra', ...process.argv.slice(2)], {
+const args = process.argv.slice(2);
+const upgradeCommands = new Set(['upgrade', 'update', '--update', '--check-updates']);
+const invoke = upgradeCommands.has(args[0]) ? 'gw' : 'orchestra';
+const result = spawnSync(process.execPath, [installScript, `--invoke=${invoke}`, ...args], {
   stdio: 'inherit',
 });
 process.exit(result.status ?? 0);

package/install.js

@@ -5,7 +5,8 @@ const fs = require('fs');
 const path = require('path');
 
 const BINARY_NAME = 'orchestra';
-const SHELL_SCRIPTS = ['gwr.sh', 'gw.sh', 'gw-bridge.sh', 'copy_env.sh', 'orchestra-local.sh'];
+const ENV_COPY_NAME = 'gw-env-copy';
+const SHELL_SCRIPTS = ['gwr.sh', 'gw.sh', 'gw-bridge.sh', 'orchestra-local.sh'];
 const SHELL_DIRS = ['shell'];
 const SUPPORTED_PLATFORMS = {
   'darwin-x64': 'macos-intel',
@@ -135,6 +136,7 @@ function linkCompatibilityBinary(binaryPath) {
 function installPrebuiltBinary() {
   const platform = getPlatformKey();
   const source = path.join(prebuiltDir, platform, BINARY_NAME);
+  const envCopySource = path.join(prebuiltDir, platform, ENV_COPY_NAME);
   
   if (!fs.existsSync(source)) {
     console.log(`⚠️  No prebuilt binary found for ${platform}`);
@@ -159,6 +161,13 @@ function installPrebuiltBinary() {
   fs.copyFileSync(source, destination);
   fs.chmodSync(destination, 0o755);
   linkCompatibilityBinary(destination);
+  if (fs.existsSync(envCopySource)) {
+    const envCopyDestination = path.join(distDir, ENV_COPY_NAME);
+    fs.copyFileSync(envCopySource, envCopyDestination);
+    fs.chmodSync(envCopyDestination, 0o755);
+  } else {
+    console.warn(`⚠️  Missing ${ENV_COPY_NAME} for ${platform}`);
+  }
   return true;
 }
 
@@ -226,12 +235,26 @@ function buildFromSource() {
   fs.copyFileSync(builtBinary, destination);
   fs.chmodSync(destination, 0o755);
   linkCompatibilityBinary(destination);
+
+  const envCopyBinary = path.join(projectRoot, 'gw-tui', 'target', 'release', ENV_COPY_NAME);
+  if (!fs.existsSync(envCopyBinary)) {
+    console.error(`❌ ${ENV_COPY_NAME} not found after build.`);
+    console.error('   Expected location:', envCopyBinary);
+    process.exit(1);
+  }
+  const envCopyDestination = path.join(distDir, ENV_COPY_NAME);
+  fs.copyFileSync(envCopyBinary, envCopyDestination);
+  fs.chmodSync(envCopyDestination, 0o755);
   
   console.log('✅ Successfully built from source!');
 }
 
 function assetsReady() {
-  return fs.existsSync(path.join(distDir, BINARY_NAME)) && fs.existsSync(path.join(distDir, 'gwr.sh'));
+  return (
+    fs.existsSync(path.join(distDir, BINARY_NAME)) &&
+    fs.existsSync(path.join(distDir, ENV_COPY_NAME)) &&
+    fs.existsSync(path.join(distDir, 'gwr.sh'))
+  );
 }
 
 function printShellWrapperInstructions(binaryPath) {

package/package.json

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

package/resources/api/tmux.sh

@@ -435,20 +435,35 @@ tmux_list_sessions_for_slug() {
   d="$(_tmux_delim)"
   ORCH_PREFIX="$(_tmux_orch_prefix)"
   
-  # If worktree_path provided, match both old (absolute-path hash) and new (slug hash)
+  # If worktree_path provided, match hash-based and no-hash prefixes
   if [[ -n "$worktree_path" ]]; then
-    local hash_slug hash_path
+    local hash_slug hash_path branch_name
     hash_slug="$(tmux_path_hash "$slug")"
     hash_path="$(tmux_path_hash "$worktree_path")"
+    branch_name="$(git_worktree_path_to_branch "$worktree_path" 2>/dev/null || true)"
+
     local p1_new="${ORCH_PREFIX}${slug}${d}${hash_slug}${d}"
     local p2_new="${slug}${d}${hash_slug}${d}"
     local p1_old="${ORCH_PREFIX}${slug}${d}${hash_path}${d}"
     local p2_old="${slug}${d}${hash_path}${d}"
-    
-    # List sessions with either hash variant
+    local p1_plain="${ORCH_PREFIX}${slug}${d}"
+    local p2_plain="${slug}${d}"
+
+    local p1_branch_hash=""
+    local p2_branch_hash=""
+    local p1_branch_plain=""
+    local p2_branch_plain=""
+    if [[ -n "$branch_name" ]]; then
+      p1_branch_hash="${ORCH_PREFIX}${branch_name}${d}${hash_path}${d}"
+      p2_branch_hash="${branch_name}${d}${hash_path}${d}"
+      p1_branch_plain="${ORCH_PREFIX}${branch_name}${d}"
+      p2_branch_plain="${branch_name}${d}"
+    fi
+
+    # List sessions with any known prefix variant
     tmux list-sessions -F '#{session_name}|||#{session_last_attached}|||#{session_activity}' 2>/dev/null \
       | sed 's/|||/\t/g' \
-      | awk -v a="$p1_new" -v b="$p2_new" -v c="$p1_old" -v d="$p2_old" 'BEGIN{FS="\t"} index($1, a)==1 || index($1, b)==1 || index($1, c)==1 || index($1, d)==1 {print $1"\t"$2"\t"$3}' \
+      | awk -v a="$p1_new" -v b="$p2_new" -v c="$p1_old" -v d="$p2_old" -v e="$p1_plain" -v f="$p2_plain" -v g="$p1_branch_hash" -v h="$p2_branch_hash" -v i="$p1_branch_plain" -v j="$p2_branch_plain" 'BEGIN{FS="\t"} (length(a)>0 && index($1, a)==1) || (length(b)>0 && index($1, b)==1) || (length(c)>0 && index($1, c)==1) || (length(d)>0 && index($1, d)==1) || (length(e)>0 && index($1, e)==1) || (length(f)>0 && index($1, f)==1) || (length(g)>0 && index($1, g)==1) || (length(h)>0 && index($1, h)==1) || (length(i)>0 && index($1, i)==1) || (length(j)>0 && index($1, j)==1) {print $1"\t"$2"\t"$3}' \
       | sort -t $'\t' -k2,2nr -k3,3nr \
       | awk -F '\t' '{print $1}' | awk '!seen[$0]++' || true
   else

package/resources/scripts/gw-bridge.sh

@@ -16,14 +16,12 @@ 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/shell/env/copy_env_load.sh"
-copy_env_init
+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 "$SCRIPT_DIR/shell/bridge/copy_env.sh"
 
 # Source git bridge modules (now modular)
 source "$SCRIPT_DIR/shell/git/bridge_worktree.sh"
@@ -37,6 +35,48 @@ err() { printf '❌ %s\n' "$*" >&2; }
 info() { printf '%s\n' "$*"; }
 have_cmd() { command -v "$1" >/dev/null 2>&1; }
 
+bridge_copy_env_files() {
+  if [[ -z "${1:-}" ]] || [[ -z "${2:-}" ]]; then
+    json_error "Source and target paths required"
+    return 1
+  fi
+  local source_path="$1"
+  local target_path="$2"
+  local raw_locations="${3-}"
+
+  local repo_root
+  repo_root="$(cd "$source_path" 2>/dev/null && git rev-parse --show-toplevel 2>/dev/null || printf '%s' "$source_path")"
+  local shared_root
+  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
+
+  local bin
+  if ! bin="$(gw_env_copy_bin)"; then
+    json_error "gw-env-copy binary not found"
+    return 1
+  fi
+
+  local args=(
+    --source "$source_path"
+    --target "$target_path"
+    --repo "$shared_root"
+    --format boolean
+    --quiet
+  )
+  if [[ -n "$raw_locations" ]]; then
+    args+=(--locations-json "$raw_locations")
+  fi
+
+  "$bin" "${args[@]}"
+}
+
 # Ensure JSON backend is available (jq preferred, python/node fallback)
 bridge_init_json_backend
 

package/resources/scripts/gw.sh

@@ -47,16 +47,13 @@ fi
 
 # Source command-line operations
   COMMANDS_DIR="$SCRIPT_DIR/shell"
-  source "$SCRIPT_DIR/shell/env/copy_env_load.sh"
-  copy_env_init
-
   for command_file in \
     "git/create_worktree.sh" \
     "git/delete_worktree.sh" \
     "git/list_worktrees.sh" \
     "git/checkout_worktree.sh" \
     "git/status.sh" \
-    "env/copy_env_command.sh" \
+    "env_copy_command.sh" \
     "tmux/new_session_command.sh"
   do
     if [[ -f "$COMMANDS_DIR/$command_file" ]]; then
@@ -137,7 +134,7 @@ usage() {
   echo "  ch, checkout <branch>         Switch to the worktree of <branch>"
   echo "  copy-env <worktreename>       Copy env files from current worktree to target"
   echo "  status [git status args]      Show current worktree + git status"
-  echo "  update, --update              Check for available updates"
+  echo "  upgrade, update, --update      Check for available updates"
   echo ""
   echo "Tmux flags:"
   echo "  --branch <branch>             Branch name for tmux session worktree"
@@ -149,7 +146,7 @@ usage() {
   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 "  $(basename "$0") upgrade     # check for available updates"
   echo ""
   echo "Note: tmux session management is available via flags or the interactive menu."
 }
@@ -242,7 +239,7 @@ case "$COMMAND" in
   ch|checkout)         cmd_checkout_worktree "$@" ;;
   status)              cmd_status "$@" ;;
   copy-env)            cmd_copy_env "$@" ;;
-  update|--update)     "$SCRIPT_DIR/shell/gwr/check-updates.sh" ;;
+  upgrade|update|--update)     "$SCRIPT_DIR/shell/gwr/check-updates.sh" ;;
   help|-h|--help)      usage ;;
   *)                   err "Unknown command '$COMMAND'"; usage ;;
  esac

package/resources/scripts/shell/AGENTS.md

@@ -20,7 +20,7 @@ shell/
 ├── gw_git.sh                # Git operations for gw CLI
 ├── gw_worktree.sh           # Worktree management for gw CLI
 ├── gw_usage.sh              # Usage text for gw command
-├── copy_env.sh              # Environment variable copying system
+├── gw_env_copy.sh           # Rust env copy helper/wrapper
 ├── commands.sh              # Shared command utilities
 ├── build/                   # Build system components
 │   ├── build_bridge.sh      # Bridge building logic
@@ -30,15 +30,6 @@ shell/
 │   ├── build_logging.sh     # Build-specific logging
 │   ├── build_rust.sh        # Rust compilation logic
 │   └── build_usage.sh       # Build command usage
-├── env/                     # Environment management
-│   ├── copy_env_command.sh  # Command processing for env copying
-│   ├── copy_env_constants.sh # Constants and paths
-│   ├── copy_env_core.sh     # Core environment copying logic
-│   ├── copy_env_debug_parse.sh # Debug parsing for env copying
-│   ├── copy_env_load.sh     # Environment loader
-│   ├── copy_env_locations.sh # Path and location management
-│   ├── copy_env_logging.sh  # Environment copying logging
-│   └── copy_env_state.sh    # State management for env copying
 ├── git/                     # Git-specific utilities
 │   └── gwr_worktree_title.sh # Worktree title generation
 └── gwr/                     # gwr-specific components
@@ -122,13 +113,12 @@ shell/
 
 ## Shared System Files
 
-### copy_env.sh
-**Purpose**: Environment variable copying system
-**Usage**: Copies environment between shell contexts
+### gw_env_copy.sh
+**Purpose**: Rust env copy helper for CLI and bridge flows
+**Usage**: Locates and invokes the `gw-env-copy` binary
 **Key Functions**:
-- `copy_env()` - Main function for environment copying
-- Critical for worktree directory changes and session management
-- Used by both gwr and gw systems
+- `gw_env_copy_bin()` - Resolve the env copy binary path
+- `gw_env_copy_files()` - Execute env copy with repo config
 
 ### commands.sh
 **Purpose**: Shared command utilities
@@ -157,17 +147,11 @@ shell/
 **Usage**: Handle specific aspects of the build process
 **Key Functions**: Each focuses on a specific build operation
 
-## Environment System (env/)
+## Rust Env Copy
 
-### copy_env_core.sh
-**Purpose**: Core environment copying logic
-**Usage**: Main implementation of environment variable copying
-**Key Functions**: `copy_env()` - Core function for environment management
-
-### copy_env_command.sh, copy_env_constants.sh, copy_env_debug_parse.sh, copy_env_load.sh, copy_env_locations.sh, copy_env_logging.sh, copy_env_state.sh
-**Purpose**: Specialized environment copying components
-**Usage**: Handle specific aspects of environment management
-**Key Functions**: Each module handles a specific aspect of the complex environment copying system
+Environment file copying is implemented in Rust via the `gw-env-copy` binary.
+Shell wrappers invoke the binary and read `.orchestra/options.json` for
+`copy_locations` when needed.
 
 ## Git Utilities (git/)
 
@@ -196,7 +180,7 @@ shell/
 
 ### gw.sh Integration
 - Sources `gw_load.sh` to load all gw components
-- Uses shared `copy_env.sh` for environment management
+- Uses `gw_env_copy.sh` to invoke the Rust env copy binary
 - Provides CLI interface to same underlying functionality
 
 ### Bridge System Integration
@@ -209,7 +193,7 @@ shell/
 1. **Modular Loading**: Each system (gwr/gw) has its own loader that sources components in dependency order
 2. **Color Consistency**: Separate color files ensure consistent theming across components
 3. **Logging Standardization**: Standardized logging functions provide consistent output
-4. **Environment Isolation**: Complex environment copying system handles shell context changes
+4. **Environment Isolation**: Rust env copy binary handles .env file replication across worktrees
 5. **Binary Discovery**: Sophisticated binary finding supports development, build, and installed scenarios
 6. **Update Integration**: Update checking integrated into main launcher with installation method detection
 
@@ -233,4 +217,4 @@ shell/
 3. Follow existing build system patterns
 4. Update `build_usage.sh` for new build options
 
-This documentation provides the foundation for AI agents to understand and work effectively with the Orchestrator shell system.
+This documentation provides the foundation for AI agents to understand and work effectively with the Orchestrator shell system.

package/resources/scripts/shell/bridge/ai.sh

@@ -160,8 +160,8 @@ bridge_manual_rename_session() {
     return 0
   fi
   
-  # Validate new display name (alphanumeric and underscore only)
-  if [[ ! "$new_display_name" =~ ^[a-zA-Z0-9_]+$ ]]; then
+  # Validate new display name (alphanumeric, underscore, hyphen only)
+  if [[ ! "$new_display_name" =~ ^[a-zA-Z0-9_-]+$ ]]; then
     echo "\"invalid_name\""
     return 0
   fi
@@ -172,4 +172,4 @@ bridge_manual_rename_session() {
   else
     echo "\"rename_failed\""
   fi
-}
+}

package/resources/scripts/shell/env_copy_command.sh

@@ -0,0 +1,29 @@
+# shellcheck shell=bash
+
+cmd_copy_env() {
+  local target_branch="${1-}"
+  if [[ -z "$target_branch" ]]; then
+    err "Target worktree name required"
+    echo "Usage: gw copy-env <worktreename>"
+    return 1
+  fi
+
+  git_require_repo || return 1
+
+  local target_path
+  target_path="$(git_branch_to_worktree_path "$target_branch")"
+  if [[ -z "$target_path" ]]; then
+    err "Worktree for branch '$target_branch' not found"
+    return 1
+  fi
+
+  local root
+  root="$(git_repo_root)"
+  local shared_root
+  shared_root="$(git_shared_root 2>/dev/null)"
+  [[ -z "$shared_root" ]] && shared_root="$root"
+
+  info "Copying env files from '$root' -> '$target_path'"
+  gw_env_copy_files "$root" "$target_path" "$shared_root"
+  info "Env files synced to '$target_branch'"
+}

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

@@ -25,11 +25,16 @@ bridge_create_worktree() {
       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
+    local env_copy_bin
+    if ! env_copy_bin="$(gw_env_copy_bin)"; then
+      json_error "gw-env-copy binary not found"
+      return 1
+    fi
+
+    "$env_copy_bin" --source "$source_path" --target "$target_path" --repo "$shared_root" --format boolean --quiet >/dev/null
     
     echo "\"$worktree_path\""
   else
     json_error "Not a git repository"
   fi
-}
+}

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

@@ -2,8 +2,8 @@
 
 # shellcheck shell=bash
 
-# Delete worktree only
-bridge_delete_worktree_only() {
+# Delete branch only
+bridge_delete_branch_only() {
   if [[ -z "${1:-}" ]]; then
     json_error "Branch name required"
     return 1
@@ -11,15 +11,13 @@ bridge_delete_worktree_only() {
   branch_name="$1"
   
   if git_require_repo_root >/dev/null 2>&1; then
-    worktree_path="$(git_branch_to_worktree_path "$branch_name")"
-    
-    if [[ -n "$worktree_path" ]]; then
-      git_remove_worktree "$worktree_path"
+    if git_branch_exists "$branch_name"; then
+      git_delete_branch "$branch_name"
       echo "true"
     else
-      json_error "No worktree found for branch: $branch_name"
+      json_error "Branch not found: $branch_name"
     fi
   else
     json_error "Not a git repository"
   fi
-}
+}

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

@@ -2,8 +2,8 @@
 
 # shellcheck shell=bash
 
-# Delete worktree
-bridge_delete_worktree() {
+# Delete worktree only
+bridge_delete_worktree_only() {
   if [[ -z "${1:-}" ]]; then
     json_error "Branch name required"
     return 1
@@ -12,17 +12,13 @@ bridge_delete_worktree() {
   
   if git_require_repo_root >/dev/null 2>&1; then
     worktree_path="$(git_branch_to_worktree_path "$branch_name")"
-    
     if [[ -n "$worktree_path" ]]; then
       git_remove_worktree "$worktree_path"
+      echo "true"
+    else
+      json_error "No worktree found for branch: $branch_name"
     fi
-    
-    if git_branch_exists "$branch_name"; then
-      git_delete_branch "$branch_name"
-    fi
-    
-    echo "true"
   else
     json_error "Not a git repository"
   fi
-}
+}

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

@@ -6,7 +6,7 @@ cmd_checkout_worktree() {
     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 source_root="$root"
     
     if [[ "${1-}" == "-b" ]]; then
         [[ -z "${2-}" ]] && { err "Branch name required for -b"; echo "Usage: gw checkout -b <branch>"; return 1; }
@@ -30,7 +30,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 "$source_root" "$wt" "$shared_root"
+                gw_env_copy_files "$source_root" "$wt" "$shared_root"
                 echo "cd \"$wt\""
             fi
             return 0
@@ -57,7 +57,7 @@ cmd_checkout_worktree() {
         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"
+            gw_env_copy_files "$source_root" "$wt" "$shared_root"
             echo "cd \"$wt\""
             return 0
         else

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

@@ -10,13 +10,13 @@ cmd_create_worktree() {
     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 source_root="$root"
 
     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"
+    gw_env_copy_files "$source_root" "$dir" "$shared_root"
     info "✅ Success! Worktree created at '$dir'."
     echo "cd \"$dir\""
     (cd "$dir" && git_status_short)

package/resources/scripts/shell/gw_env_copy.sh

@@ -0,0 +1,65 @@
+# shellcheck shell=bash
+
+gw_env_copy_bin() {
+  local candidate=""
+
+  if [[ -n "${GW_ENV_COPY_BIN:-}" && -x "$GW_ENV_COPY_BIN" ]]; then
+    printf '%s\n' "$GW_ENV_COPY_BIN"
+    return 0
+  fi
+
+  if [[ -n "${SCRIPT_DIR:-}" ]]; then
+    candidate="$SCRIPT_DIR/gw-env-copy"
+    if [[ -x "$candidate" ]]; then
+      printf '%s\n' "$candidate"
+      return 0
+    fi
+    candidate="$SCRIPT_DIR/gw-tui/target/release/gw-env-copy"
+    if [[ -x "$candidate" ]]; then
+      printf '%s\n' "$candidate"
+      return 0
+    fi
+    candidate="$SCRIPT_DIR/gw-tui/target/debug/gw-env-copy"
+    if [[ -x "$candidate" ]]; then
+      printf '%s\n' "$candidate"
+      return 0
+    fi
+  fi
+
+  if [[ -n "${GW_ORCHESTRATOR_ROOT:-}" ]]; then
+    candidate="$GW_ORCHESTRATOR_ROOT/gw-env-copy"
+    if [[ -x "$candidate" ]]; then
+      printf '%s\n' "$candidate"
+      return 0
+    fi
+  fi
+
+  if command -v gw-env-copy >/dev/null 2>&1; then
+    command -v gw-env-copy
+    return 0
+  fi
+
+  return 1
+}
+
+gw_env_copy_files() {
+  local source_root="$1"
+  local target_root="$2"
+  local repo_root="${3:-$source_root}"
+
+  local bin
+  if ! bin="$(gw_env_copy_bin)"; then
+    if declare -f err >/dev/null 2>&1; then
+      err "gw-env-copy binary not found"
+    else
+      printf 'Error: %s\n' "gw-env-copy binary not found" >&2
+    fi
+    return 1
+  fi
+
+  "$bin" \
+    --source "$source_root" \
+    --target "$target_root" \
+    --repo "$repo_root" \
+    --format text
+}

package/resources/scripts/shell/gw_load.sh

@@ -5,5 +5,6 @@ gw_load_core() {
   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_env_copy.sh"
   source "$SCRIPT_DIR/shell/gw_legacy_wrappers.sh"
 }

package/resources/scripts/shell/gwr/check-updates.sh

@@ -37,9 +37,17 @@ get_npm_latest_version() {
 # Function to get latest homebrew version
 get_brew_latest_version() {
     if command -v brew >/dev/null 2>&1; then
-        brew info --json "$BREW_FORMULA" 2>/dev/null | \
-            python3 -c "import sys, json; data = json.load(sys.stdin); print(data[0]['versions']['stable'])" 2>/dev/null || \
-        echo "unknown"
+        if command -v jq >/dev/null 2>&1; then
+            brew info --json=v2 "$BREW_FORMULA" 2>/dev/null | \
+                jq -r '.[0].versions.stable // "unknown"' 2>/dev/null || \
+            echo "unknown"
+        elif command -v node >/dev/null 2>&1; then
+            brew info --json=v2 "$BREW_FORMULA" 2>/dev/null | \
+                node -e "const fs=require('fs');const d=JSON.parse(fs.readFileSync(0,'utf8'));console.log(d[0]?.versions?.stable||'unknown');" 2>/dev/null || \
+            echo "unknown"
+        else
+            echo "unknown"
+        fi
     else
         echo "brew_not_found"
     fi
@@ -106,9 +114,18 @@ check_updates() {
             latest_version=$(get_npm_latest_version)
             ;;
         "brew")
-            current_version=$(brew info --json "$BREW_FORMULA" 2>/dev/null | \
-                python3 -c "import sys, json; data = json.load(sys.stdin); print(data[0]['installed'][0]['version'])" 2>/dev/null || \
-                echo "$CURRENT_VERSION")
+            if command -v jq >/dev/null 2>&1; then
+                current_version=$(brew info --json=v2 "$BREW_FORMULA" 2>/dev/null | \
+                    jq -r '.[0].installed[0].version // ""' 2>/dev/null)
+            elif command -v node >/dev/null 2>&1; then
+                current_version=$(brew info --json=v2 "$BREW_FORMULA" 2>/dev/null | \
+                    node -e "const fs=require('fs');const d=JSON.parse(fs.readFileSync(0,'utf8'));console.log(d[0]?.installed?.[0]?.version||'');" 2>/dev/null)
+            else
+                current_version=""
+            fi
+            if [[ -z "$current_version" ]]; then
+                current_version="$CURRENT_VERSION"
+            fi
             latest_version=$(get_brew_latest_version)
             ;;
         "local")
@@ -171,4 +188,4 @@ check_updates() {
 }
 
 # Run the update check
-check_updates "$@"
+check_updates "$@"