Merge branch 'main' into fix-open-ai

Author: karan925

CHANGELOG.md

@@ -6,6 +6,22 @@ The format is based on [Keep a Changelog](https://keepachangelog.com), and this
 
 ## [Unreleased]
 
+## [2.4.0] - 2026-02-24
+
+### Added
+
+- Interactive fzf worktree picker for `gtr cd` with preview, keybindings, and multi-action support ([#136](https://github.com/coderabbitai/git-worktree-runner/pull/136))
+- Helpful error message when running `git gtr cd` explaining shell integration requirement ([#137](https://github.com/coderabbitai/git-worktree-runner/pull/137))
+
+### Changed
+
+- Limit `find` depth for simple directory copy patterns for better performance ([#130](https://github.com/coderabbitai/git-worktree-runner/pull/130))
+
+### Fixed
+
+- Root-level files now matched correctly for `**` glob patterns on Bash 3.2 ([#133](https://github.com/coderabbitai/git-worktree-runner/pull/133))
+- Antigravity adapter support ([#131](https://github.com/coderabbitai/git-worktree-runner/pull/131))
+
 ## [2.3.1] - 2026-02-17
 
 ### Added
@@ -140,7 +156,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com), and this
 
 - Improved base directory resolution logic to distinguish `.` (repo root), `./path` (repo-internal) from other relative values (sibling directories)
 
-[Unreleased]: https://github.com/coderabbitai/git-worktree-runner/compare/v2.3.1...HEAD
+[Unreleased]: https://github.com/coderabbitai/git-worktree-runner/compare/v2.4.0...HEAD
+[2.4.0]: https://github.com/coderabbitai/git-worktree-runner/compare/v2.3.1...v2.4.0
 [2.3.1]: https://github.com/coderabbitai/git-worktree-runner/compare/v2.3.0...v2.3.1
 [2.3.0]: https://github.com/coderabbitai/git-worktree-runner/compare/v2.2.0...v2.3.0
 [2.2.0]: https://github.com/coderabbitai/git-worktree-runner/compare/v2.1.0...v2.2.0

bin/git-gtr

@@ -11,7 +11,7 @@ if [ -n "${GTR_DEBUG:-}" ]; then
 fi
 
 # Version
-GTR_VERSION="2.3.1"
+GTR_VERSION="2.4.0"
 
 # Find the script directory (resolve symlinks; allow env override)
 resolve_script_dir() {
@@ -106,6 +106,14 @@ main() {
     help|--help|-h)
       cmd_help "$@"
       ;;
+    cd)
+      local _shell_name
+      _shell_name="$(basename "${SHELL:-bash}")"
+      log_error "'cd' requires shell integration (subprocesses cannot change your shell's directory)"
+      log_info "Set up with: eval \"\$(git gtr init $_shell_name)\""
+      log_info "Then use:    gtr cd [<branch>]"
+      exit 1
+      ;;
     *)
       log_error "Unknown command: $cmd"
       echo "Use 'git gtr help' for available commands"

lib/commands/doctor.sh

@@ -114,11 +114,32 @@ cmd_doctor() {
 
   # Check fzf (optional, for interactive picker)
   if command -v fzf >/dev/null 2>&1; then
-    echo "[OK] fzf: $(fzf --version 2>/dev/null | awk '{print $1}') (interactive picker available)"
+    echo "[OK] fzf: $(fzf --version 2>/dev/null | awk '{print $1}') (interactive picker: gtr cd)"
   else
     echo "[i] fzf: not found (install for interactive picker: gtr cd)"
   fi
 
+  # Check shell integration (required for gtr cd)
+  local _shell_name _rc_file
+  _shell_name="$(basename "${SHELL:-bash}")"
+  case "$_shell_name" in
+    zsh)  _rc_file="$HOME/.zshrc" ;;
+    bash) _rc_file="$HOME/.bashrc" ;;
+    fish) _rc_file="$HOME/.config/fish/config.fish" ;;
+    *)    _rc_file="" ;;
+  esac
+  if [ -n "$_rc_file" ] && [ -f "$_rc_file" ] && grep -q 'git gtr init' "$_rc_file" 2>/dev/null; then
+    echo "[OK] Shell integration: loaded (gtr cd available)"
+  elif [ -n "$_rc_file" ]; then
+    local _init_hint
+    if [ "$_shell_name" = "fish" ]; then
+      _init_hint="git gtr init fish | source"
+    else
+      _init_hint="eval \"\$(git gtr init $_shell_name)\""
+    fi
+    echo "[i] Shell integration: $_init_hint in ${_rc_file##*/} for gtr cd"
+  fi
+
   echo ""
   if [ "$issues" -eq 0 ]; then
     echo "Everything looks good!"

lib/commands/init.sh

@@ -85,6 +85,14 @@ __FUNC__() {
     if [ "$#" -eq 0 ] && command -v fzf >/dev/null 2>&1; then
       local _gtr_selection _gtr_key _gtr_line
       _gtr_selection="$(command git gtr list --porcelain | fzf \
+      local _gtr_porcelain
+      _gtr_porcelain="$(command git gtr list --porcelain)"
+      if [ "$(printf '%s\n' "$_gtr_porcelain" | wc -l)" -le 1 ]; then
+        echo "No worktrees to pick from. Create one with: git gtr new <branch>" >&2
+        return 0
+      fi
+      local _gtr_selection
+      _gtr_selection="$(printf '%s\n' "$_gtr_porcelain" | fzf \
         --delimiter=$'\t' \
         --with-nth=2 \
         --ansi \
@@ -195,6 +203,14 @@ __FUNC__() {
     if [ "$#" -eq 0 ] && command -v fzf >/dev/null 2>&1; then
       local _gtr_selection _gtr_key _gtr_line
       _gtr_selection="$(command git gtr list --porcelain | fzf \
+      local _gtr_porcelain
+      _gtr_porcelain="$(command git gtr list --porcelain)"
+      if [ "$(printf '%s\n' "$_gtr_porcelain" | wc -l)" -le 1 ]; then
+        echo "No worktrees to pick from. Create one with: git gtr new <branch>" >&2
+        return 0
+      fi
+      local _gtr_selection
+      _gtr_selection="$(printf '%s\n' "$_gtr_porcelain" | fzf \
         --delimiter=$'\t' \
         --with-nth=2 \
         --ansi \
@@ -307,7 +323,12 @@ function __FUNC__
   if test (count $argv) -gt 0; and test "$argv[1]" = "cd"
     set -l dir
     if test (count $argv) -eq 1; and type -q fzf
-      set -l _gtr_selection (command git gtr list --porcelain | fzf \
+      set -l _gtr_porcelain (command git gtr list --porcelain)
+      if test (count $_gtr_porcelain) -le 1
+        echo "No worktrees to pick from. Create one with: git gtr new <branch>" >&2
+        return 0
+      end
+      set -l _gtr_selection (printf '%s\n' $_gtr_porcelain | fzf \
         --delimiter=\t \
         --with-nth=2 \
         --ansi \