feat(init): add ctrl-n keybinding to create new worktree from fzf picker

Author: karan925

lib/commands/init.sh

@@ -89,24 +89,31 @@ __FUNC__() {
         echo "No worktrees to pick from. Create one with: git gtr new <branch>" >&2
         return 0
       fi
-      local _gtr_selection _gtr_key _gtr_line
+      local _gtr_selection _gtr_key _gtr_line _gtr_branch
       _gtr_selection="$(printf '%s\n' "$_gtr_porcelain" | fzf \
         --delimiter=$'\t' \
         --with-nth=2 \
         --ansi \
         --layout=reverse \
         --border \
         --prompt='Worktree> ' \
-        --header='enter:cd │ ctrl-e:editor │ ctrl-a:ai │ ctrl-d:delete │ ctrl-y:copy │ ctrl-r:refresh' \
+        --header='enter:cd │ ctrl-n:new │ ctrl-e:editor │ ctrl-a:ai │ ctrl-d:delete │ ctrl-y:copy │ ctrl-r:refresh' \
+        --expect=ctrl-n,ctrl-a,ctrl-e \
         --preview='git -C {1} log --oneline --graph --color=always -15 2>/dev/null; echo "---"; git -C {1} status --short 2>/dev/null' \
         --preview-window=right:50% \
-        --expect=ctrl-a,ctrl-e \
         --bind='ctrl-d:execute(git gtr rm {2} > /dev/tty 2>&1 < /dev/tty)+reload(git gtr list --porcelain)' \
         --bind='ctrl-y:execute(git gtr copy {2} > /dev/tty 2>&1 < /dev/tty)' \
         --bind='ctrl-r:reload(git gtr list --porcelain)')" || return 0
       [ -z "$_gtr_selection" ] && return 0
       _gtr_key="$(head -1 <<< "$_gtr_selection")"
       _gtr_line="$(sed -n '2p' <<< "$_gtr_selection")"
+      if [ "$_gtr_key" = "ctrl-n" ]; then
+        printf "Branch name: " >&2
+        read -r _gtr_branch
+        [ -z "$_gtr_branch" ] && return 0
+        command git gtr new "$_gtr_branch"
+        return $?
+      fi
       [ -z "$_gtr_line" ] && return 0
       # ctrl-a/ctrl-e: run after fzf exits (needs full terminal for TUI apps)
       if [ "$_gtr_key" = "ctrl-a" ]; then
@@ -205,24 +212,31 @@ __FUNC__() {
         echo "No worktrees to pick from. Create one with: git gtr new <branch>" >&2
         return 0
       fi
-      local _gtr_selection _gtr_key _gtr_line
+      local _gtr_selection _gtr_key _gtr_line _gtr_branch
       _gtr_selection="$(printf '%s\n' "$_gtr_porcelain" | fzf \
         --delimiter=$'\t' \
         --with-nth=2 \
         --ansi \
         --layout=reverse \
         --border \
         --prompt='Worktree> ' \
-        --header='enter:cd │ ctrl-e:editor │ ctrl-a:ai │ ctrl-d:delete │ ctrl-y:copy │ ctrl-r:refresh' \
+        --header='enter:cd │ ctrl-n:new │ ctrl-e:editor │ ctrl-a:ai │ ctrl-d:delete │ ctrl-y:copy │ ctrl-r:refresh' \
+        --expect=ctrl-n,ctrl-a,ctrl-e \
         --preview='git -C {1} log --oneline --graph --color=always -15 2>/dev/null; echo "---"; git -C {1} status --short 2>/dev/null' \
         --preview-window=right:50% \
-        --expect=ctrl-a,ctrl-e \
         --bind='ctrl-d:execute(git gtr rm {2} > /dev/tty 2>&1 < /dev/tty)+reload(git gtr list --porcelain)' \
         --bind='ctrl-y:execute(git gtr copy {2} > /dev/tty 2>&1 < /dev/tty)' \
         --bind='ctrl-r:reload(git gtr list --porcelain)')" || return 0
       [ -z "$_gtr_selection" ] && return 0
       _gtr_key="$(head -1 <<< "$_gtr_selection")"
       _gtr_line="$(sed -n '2p' <<< "$_gtr_selection")"
+      if [ "$_gtr_key" = "ctrl-n" ]; then
+        printf "Branch name: " >&2
+        read -r _gtr_branch
+        [ -z "$_gtr_branch" ] && return 0
+        command git gtr new "$_gtr_branch"
+        return $?
+      fi
       [ -z "$_gtr_line" ] && return 0
       # ctrl-a/ctrl-e: run after fzf exits (needs full terminal for TUI apps)
       if [ "$_gtr_key" = "ctrl-a" ]; then
@@ -331,10 +345,10 @@ function __FUNC__
         --layout=reverse \
         --border \
         --prompt='Worktree> ' \
-        --header='enter:cd │ ctrl-e:editor │ ctrl-a:ai │ ctrl-d:delete │ ctrl-y:copy │ ctrl-r:refresh' \
+        --header='enter:cd │ ctrl-n:new │ ctrl-e:editor │ ctrl-a:ai │ ctrl-d:delete │ ctrl-y:copy │ ctrl-r:refresh' \
+        --expect=ctrl-n,ctrl-a,ctrl-e \
         --preview='git -C {1} log --oneline --graph --color=always -15 2>/dev/null; echo "---"; git -C {1} status --short 2>/dev/null' \
         --preview-window=right:50% \
-        --expect=ctrl-a,ctrl-e \
         --bind='ctrl-d:execute(git gtr rm {2} > /dev/tty 2>&1 < /dev/tty)+reload(git gtr list --porcelain)' \
         --bind='ctrl-y:execute(git gtr copy {2} > /dev/tty 2>&1 < /dev/tty)' \
         --bind='ctrl-r:reload(git gtr list --porcelain)')
@@ -350,6 +364,12 @@ function __FUNC__
         set -l _gtr_key "$_gtr_selection[1]"
         set -l _gtr_line "$_gtr_selection[2]"
       end
+      if test "$_gtr_key" = "ctrl-n"
+        read -P "Branch name: " _gtr_branch
+        test -z "$_gtr_branch"; and return 0
+        command git gtr new "$_gtr_branch"
+        return $status
+      end
       test -z "$_gtr_line"; and return 0
       # ctrl-a/ctrl-e: run after fzf exits (needs full terminal for TUI apps)
       if test "$_gtr_key" = "ctrl-a"

tests/init.bats

@@ -408,6 +408,80 @@ setup() {
   [[ "$output" == *'Usage: gwtr cd <branch>'* ]]
 }
 
+# ── ctrl-n (new worktree) in fzf picker ────────────────────────────────────
+
+@test "bash output includes --expect=ctrl-n in fzf args" {
+  run cmd_init bash
+  [ "$status" -eq 0 ]
+  [[ "$output" == *"--expect=ctrl-n"* ]]
+}
+
+@test "zsh output includes --expect=ctrl-n in fzf args" {
+  run cmd_init zsh
+  [ "$status" -eq 0 ]
+  [[ "$output" == *"--expect=ctrl-n"* ]]
+}
+
+@test "fish output includes --expect=ctrl-n in fzf args" {
+  run cmd_init fish
+  [ "$status" -eq 0 ]
+  [[ "$output" == *"--expect=ctrl-n"* ]]
+}
+
+@test "bash output includes ctrl-n:new in fzf header" {
+  run cmd_init bash
+  [ "$status" -eq 0 ]
+  [[ "$output" == *"ctrl-n:new"* ]]
+}
+
+@test "zsh output includes ctrl-n:new in fzf header" {
+  run cmd_init zsh
+  [ "$status" -eq 0 ]
+  [[ "$output" == *"ctrl-n:new"* ]]
+}
+
+@test "fish output includes ctrl-n:new in fzf header" {
+  run cmd_init fish
+  [ "$status" -eq 0 ]
+  [[ "$output" == *"ctrl-n:new"* ]]
+}
+
+@test "bash output includes git gtr new in ctrl-n handler" {
+  run cmd_init bash
+  [ "$status" -eq 0 ]
+  [[ "$output" == *'git gtr new "$_gtr_branch"'* ]]
+}
+
+@test "zsh output includes git gtr new in ctrl-n handler" {
+  run cmd_init zsh
+  [ "$status" -eq 0 ]
+  [[ "$output" == *'git gtr new "$_gtr_branch"'* ]]
+}
+
+@test "fish output includes git gtr new in ctrl-n handler" {
+  run cmd_init fish
+  [ "$status" -eq 0 ]
+  [[ "$output" == *'git gtr new "$_gtr_branch"'* ]]
+}
+
+@test "bash output prompts for branch name on ctrl-n" {
+  run cmd_init bash
+  [ "$status" -eq 0 ]
+  [[ "$output" == *'Branch name: '* ]]
+}
+
+@test "zsh output prompts for branch name on ctrl-n" {
+  run cmd_init zsh
+  [ "$status" -eq 0 ]
+  [[ "$output" == *'Branch name: '* ]]
+}
+
+@test "fish output prompts for branch name on ctrl-n" {
+  run cmd_init fish
+  [ "$status" -eq 0 ]
+  [[ "$output" == *'Branch name: '* ]]
+}
+
 # ── git gtr passthrough preserved ────────────────────────────────────────────
 
 @test "bash output passes non-cd commands to git gtr" {