diff --git a/bin/gbf b/bin/gbf
index 4a3303d..259ac69 100755
--- a/bin/gbf
+++ b/bin/gbf
@@ -3,4 +3,6 @@
 # `gbf <filename>` git branch file
 
 filename=$1;
-git_log_oneline_new --follow --patch -- "$filename"
+range=${2:-git_current_branch_range}
+shift 2
+git_log_oneline --follow --patch "$range" "$@" -- "$filename"
diff --git a/bin/gbl b/bin/gbl
index ceea216..fa794f1 100755
--- a/bin/gbl
+++ b/bin/gbl
@@ -3,5 +3,6 @@
 # `gbl [<base branch>]` git branch log
 # list commits added to this branch since forked from <base branch> or main branch.
 
-base_branch=${1:-"$(git_main_base_branch)"};
-git_log_oneline "$base_branch" | more -eRSF
+base_branch=${1:-"$(git_current_branch_range)"};
+shift
+git_log_oneline "$base_branch" "$@"
diff --git a/bin/git_commit_during_rebase b/bin/git_commit_during_rebase
index 737811b..03041b1 100755
--- a/bin/git_commit_during_rebase
+++ b/bin/git_commit_during_rebase
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 
 echo git_commit_during_rebase;
-git_add_p && ( git_status_clean || git commit --no-edit --no-verify 2> /dev/null || ( git commit --amend --no-edit --no-verify ) ) && ( git_status_clean || git_stash )
+git_add_p && ( git_status_clean || git commit --no-edit --no-verify 2> /dev/null || ( ! git merge-base --is-ancestor HEAD "$(git_main_base_branch)" && git commit --amend --no-edit --no-verify || git commit -m "Auto lint" --no-verify ) ) && ( git_status_clean || git_stash )
diff --git a/bin/git_current_branch_range b/bin/git_current_branch_range
new file mode 100755
index 0000000..7a7a768
--- /dev/null
+++ b/bin/git_current_branch_range
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+if [[ "$(git_branch_name)" == "$(git_main_branch)" ]]; then
+  echo HEAD
+else
+  echo "$(git_main_base_branch)"..HEAD
+fi
diff --git a/bin/git_find_sha b/bin/git_find_sha
index d9b1a2e..b5a65cc 100755
--- a/bin/git_find_sha
+++ b/bin/git_find_sha
@@ -12,7 +12,7 @@
     commits=();
     while IFS= read -r line; do
         commits+=("$line");
-    done < <(git_log_oneline "$root" 2>/dev/null | grep -E -e '^([^\sm]+m)?'"$val" -e '\s.*'"$val");
+    done < <(git_log_oneline "$root"..HEAD 2>/dev/null | grep -E -e '^([^\sm]+m)?'"$val" -e '\s.*'"$val");
     if (( ${#commits[@]} > 1 )); then
         echoerr "Multiple possible commits found:";
         for commit in "${commits[@]}";
diff --git a/bin/git_log_oneline b/bin/git_log_oneline
index 0a420c3..1945eef 100755
--- a/bin/git_log_oneline
+++ b/bin/git_log_oneline
@@ -1,33 +1,8 @@
 #!/usr/bin/env bash
 
-
-
-
-
-echo ${COLOR_GREY}git log --oneline $(git_log_range "$1")$COLOR_RESET 1>&2;
-commits_in_origin=$(echo $(git log --format="%h" $(git merge-base --fork-point $(git_main_base_branch)) 2>/dev/null));
-# local commits_in_origin=$(echo -e $(git log --format="%h" $(git_log_range "$1" HEAD) 2>/dev/null))
-commit_in_origin_condition='index("'$commits_in_origin'", $2) > 0';
-git log --reverse --format="%b%n§%h§%s§%cr" | awk -F'§' '{
-  if ($0 ~ "^$") {
-    # do nothing
-  } else if ($1 != "" ) {
-    body = body " " $1
-  } else {
-    if('"$commit_in_origin_condition"') {
-      printf "%s", "'$COLOR_AQUA'"
-    } else {
-      printf "%s", "'$COLOR_GREEN'"
-    }
-    printf "%s%s%s%s%s", $2, " '$COLOR_RESET'", $3, " '$COLOR_LOWLIGHT", $4
-
-    if (body != "") {
-      gsub("\r", "", body)
-      printf "%s%s", "'$COLOR_GREY''$COLOR_LOWLIGHT'", body
-    }
-
-    body=""
-
-    print "'$COLOR_RESET'"
-  }
-}'
+git --no-pager \
+log \
+  --color \
+  --reverse \
+  --format='%h%Creset%Cred%Cgreen%Cblue%Creset%(decorate) %s %C(dim)%cr - %cn%Creset' \
+  "$@" | git_log_oneline_process
diff --git a/bin/git_log_oneline_new b/bin/git_log_oneline_new
deleted file mode 100755
index fd5421d..0000000
--- a/bin/git_log_oneline_new
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-# git_main_remote_branch >/dev/null 2>&1 # ensure we have origin/HEAD and upstream/HEAD if we should
-git --no-pager log --color --reverse --format='%h%Creset%(decorate) %s %C(dim)%cr - %cn%Creset' "$@"
diff --git a/bin/git_log_oneline_new_2 b/bin/git_log_oneline_new_2
deleted file mode 100755
index 20d602b..0000000
--- a/bin/git_log_oneline_new_2
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/usr/bin/env bash
-
diff --git a/bin/git_log_oneline_process b/bin/git_log_oneline_process
index 962d152..6cee94f 100755
--- a/bin/git_log_oneline_process
+++ b/bin/git_log_oneline_process
@@ -1,11 +1,8 @@
 #!/usr/bin/env ruby --disable-all
 
-if ARGV.delete('--off')
-  while gets
-    puts $_
-  end
-  exit 0
-end
+# frozen_string_literal: true
+
+# rubocop:disable Style/SpecialGlobalVars
 
 def branch_exist?(branch)
   (
@@ -27,38 +24,52 @@ def current_branch_main?
   main_branch == current_branch
 end
 
-$forks = {
-  magenta: 'upstream/HEAD',
-  blue: (branch_exist?('origin/HEAD') ? 'origin/HEAD' : main_branch),
-  cyan: ('@{u}' unless current_branch_main?)
-}
+def forks
+  @forks ||= {
+    magenta: 'upstream/HEAD',
+    blue: (branch_exist?('origin/HEAD') ? 'origin/HEAD' : main_branch),
+    cyan: ('@{u}' unless current_branch_main?),
+    green: 'HEAD'
+  }.select { |_, v| branch_exist?(v) }
+end
 
-$forks.select! { |k, v| branch_exist?(v) }
+# this is split on the magic sigil in git_log_oneline
+def next_line_split(line)
+  line.split("\e[m\e[31m\e[32m\e[34m\e[m", 2)
+end
 
 gets
-exit 0 unless $_
-sha, rest = $_.split("\e", 2)
+line = $_
+exit 0 unless line
+sha, rest = next_line_split(line)
 first = `git rev-parse --short #{sha}^ 2>/dev/null`.chomp
 first = first.empty? ? '' : "#{first}.."
-$forks.transform_values! do |v|
+forks.transform_values! do |v|
   `git log --format=%h #{first}#{v}`.chomp.split("\n").to_h { |k| [k, nil] }
 end
-def render(sha, rest)
-  color = if $forks[:magenta]&.key?(sha)
+
+def render(sha, rest) # rubocop:disable Metrics
+  color = if forks[:magenta]&.key?(sha)
     "\e[35m"
-  elsif $forks[:blue]&.key?(sha)
+  elsif forks[:blue]&.key?(sha)
     "\e[34m"
-  elsif $forks[:cyan]&.key?(sha)
+  elsif forks[:cyan]&.key?(sha)
     "\e[36m"
-  else
+  elsif forks[:green]&.key?(sha)
     "\e[32m"
   end
-  "#{color}#{sha}\e#{rest.chomp}\e[0m"
+  "#{color}#{sha}\e[m#{rest.chomp}\e[0m"
 end
-print "\x1b[?7l"
-print render(sha, rest)
+
+print "\e[?7l" # disable line wrap
+print render(sha.chomp, rest)
+
 while gets
   puts
-  print render(*$_.split("\e", 2))
+  sha, rest = next_line_split($_)
+  print render(sha.chomp, rest.to_s)
 end
-puts "\x1b[?7h"
+
+puts "\e[?7h" # reenable line wrap
+
+# rubocop:enable Style/SpecialGlobalVars
diff --git a/bin/git_rebase_onto b/bin/git_rebase_onto
index c0eebbf..ce38b62 100755
--- a/bin/git_rebase_onto
+++ b/bin/git_rebase_onto
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-    cat $(git rev-parse --git-path rebase-merge/onto) $(git rev-parse --git-path rebase-apply/onto) 2> /dev/null
+cat $(git rev-parse --git-path rebase-merge/onto) $(git rev-parse --git-path rebase-apply/onto) 2> /dev/null
diff --git a/bin/rtr b/bin/rtr
index fd99676..ef011b0 100755
--- a/bin/rtr
+++ b/bin/rtr
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 
-    rt --failure-exit-code 2 "$@";
-    [[ "$?" != "1" ]] && rtr "$@"
+rt --failure-exit-code 2 "$@";
+[[ "$?" != "1" ]] && rtr "$@"
diff --git a/bin/strip_color b/bin/strip_color
index d2853e7..b505ae5 100755
--- a/bin/strip_color
+++ b/bin/strip_color
@@ -1,7 +1,9 @@
 #!/usr/bin/env bash
 
+# also strip the disabling of line wrap
+# that gets added by git_log_oneline_process
 if (( $# == 0 )); then
-  sed -E "/^[[:cntrl:]]\\[1;90m.*[[:cntrl:]]\\[0m$/d;s/([[:cntrl:]]\\[[0-9]{1,3}(;[0-9]{1,3})*m)//g"
+  sed -E 's/(\x1b\[[0-9;]*m|\x1b\[\?7[lh])//g'
 else
   echo -e "$@" | "$BASH_SOURCE"
 fi
diff --git a/spec/bash_support_spec.rb b/spec/bash_support_spec.rb
index 132ca84..342f9be 100644
--- a/spec/bash_support_spec.rb
+++ b/spec/bash_support_spec.rb
@@ -1,15 +1,5 @@
 # frozen_string_literal: true
 
-COLOR_RED = ENV.fetch('COLOR_RED')
-COLOR_GREEN = ENV.fetch('COLOR_GREEN')
-COLOR_YELLOW = ENV.fetch('COLOR_YELLOW')
-COLOR_BLUE = ENV.fetch('COLOR_BLUE')
-COLOR_AQUA = ENV.fetch('COLOR_AQUA')
-COLOR_GREY = ENV.fetch('COLOR_GREY')
-COLOR_PINK = ENV.fetch('COLOR_PINK')
-COLOR_RESET = ENV.fetch('COLOR_RESET')
-COLOR_LIGHT_PINK = ENV.fetch('COLOR_LIGHT_PINK')
-
 RSpec.describe 'bash_support' do
   it 'returns current ruby version' do
     copy_file '.ruby-version'
@@ -20,8 +10,8 @@
 
   describe 'echoerr' do
     it 'returns red text for echoerr' do
-      expect(run('echoerr No', expect_exit: 1)).to have_output(
-        stderr: "#{COLOR_RED}error: No#{COLOR_RESET}\n",
+      expect(run('echoerr No', exit_with: 1)).to have_output(
+        stderr: "\e[31merror: No\e[0m\n",
         stdout: nil
       )
     end
@@ -30,140 +20,140 @@
   describe 'echodo' do
     it 'returns grey text for echodo to stderr and does the thing to stdout' do
       expect(run('echodo echo 1')).to have_output(
-        stderr: "#{COLOR_GREY}echo 1#{COLOR_RESET}\n",
+        stderr: "\e[0;2mecho 1\e[0m\n",
         stdout: "1\n"
       )
     end
 
     it 'removes unnecessary single quotes' do
       expect(run("echodo echo '1'")).to have_output(
-        stderr: "#{COLOR_GREY}echo 1#{COLOR_RESET}\n",
+        stderr: "\e[0;2mecho 1\e[0m\n",
         stdout: "1\n"
       )
     end
 
     it 'removes unnecessary double quotes' do
       expect(run('echodo echo "1"')).to have_output(
-        stderr: "#{COLOR_GREY}echo 1#{COLOR_RESET}\n",
+        stderr: "\e[0;2mecho 1\e[0m\n",
         stdout: "1\n"
       )
     end
 
     it 'retains quoted empty double quoted strings' do
       expect(run('echodo echo ""')).to have_output(
-        stderr: "#{COLOR_GREY}echo ''#{COLOR_RESET}\n",
+        stderr: "\e[0;2mecho ''\e[0m\n",
         stdout: "\n"
       )
     end
 
     it 'retains quoted empty single quoted strings' do
       expect(run("echodo echo ''")).to have_output(
-        stderr: "#{COLOR_GREY}echo ''#{COLOR_RESET}\n",
+        stderr: "\e[0;2mecho ''\e[0m\n",
         stdout: "\n"
       )
     end
 
     it 'uses single quotes to escape spaces when given a single quoted string' do
       expect(run("echodo echo '1 and 2'")).to have_output(
-        stderr: "#{COLOR_GREY}echo '1 and 2'#{COLOR_RESET}\n",
+        stderr: "\e[0;2mecho '1 and 2'\e[0m\n",
         stdout: "1 and 2\n"
       )
     end
 
     it 'uses single quotes to escape spaces when given a double quoted string' do
       expect(run('echodo echo "1 and 2"')).to have_output(
-        stderr: "#{COLOR_GREY}echo '1 and 2'#{COLOR_RESET}\n",
+        stderr: "\e[0;2mecho '1 and 2'\e[0m\n",
         stdout: "1 and 2\n"
       )
     end
 
     it 'uses single quotes to escape spaces when given a backslash escaped string' do
       expect(run('echodo echo 1\\ and\\ 2')).to have_output(
-        stderr: "#{COLOR_GREY}echo '1 and 2'#{COLOR_RESET}\n",
+        stderr: "\e[0;2mecho '1 and 2'\e[0m\n",
         stdout: "1 and 2\n"
       )
     end
 
     it 'uses single quotes to escape \\(whatever\\)' do
       expect(run('echodo echo \\(whatever\\)')).to have_output(
-        stderr: "#{COLOR_GREY}echo '(whatever)'#{COLOR_RESET}\n",
+        stderr: "\e[0;2mecho '(whatever)'\e[0m\n",
         stdout: "(whatever)\n"
       )
     end
 
     it "uses single quotes to escape '(whatever)'" do
       expect(run("echodo echo '(whatever)'")).to have_output(
-        stderr: "#{COLOR_GREY}echo '(whatever)'#{COLOR_RESET}\n",
+        stderr: "\e[0;2mecho '(whatever)'\e[0m\n",
         stdout: "(whatever)\n"
       )
     end
 
     it "uses single quotes to escape '[whatever]" do
       expect(run("echodo echo '[whatever]'")).to have_output(
-        stderr: "#{COLOR_GREY}echo '[whatever]'#{COLOR_RESET}\n",
+        stderr: "\e[0;2mecho '[whatever]'\e[0m\n",
         stdout: "[whatever]\n"
       )
     end
 
     it "uses single quotes to escape 'what)ever]'" do
       expect(run("echodo echo 'what)ever]'")).to have_output(
-        stderr: "#{COLOR_GREY}echo 'what)ever]'#{COLOR_RESET}\n",
+        stderr: "\e[0;2mecho 'what)ever]'\e[0m\n",
         stdout: "what)ever]\n"
       )
     end
 
     it "uses single quotes to escape 'what) ever]'" do
       expect(run("echodo echo 'what) ever]'")).to have_output(
-        stderr: "#{COLOR_GREY}echo 'what) ever]'#{COLOR_RESET}\n",
+        stderr: "\e[0;2mecho 'what) ever]'\e[0m\n",
         stdout: "what) ever]\n"
       )
     end
 
     it "uses single quotes to escape 'what)ever'" do
       expect(run("echodo echo 'what)ever'")).to have_output(
-        stderr: "#{COLOR_GREY}echo 'what)ever'#{COLOR_RESET}\n",
+        stderr: "\e[0;2mecho 'what)ever'\e[0m\n",
         stdout: "what)ever\n"
       )
     end
 
     it "uses single quotes to escape 'what>ever'" do
       expect(run("echodo echo 'what>ever'")).to have_output(
-        stderr: "#{COLOR_GREY}echo 'what>ever'#{COLOR_RESET}\n",
+        stderr: "\e[0;2mecho 'what>ever'\e[0m\n",
         stdout: "what>ever\n"
       )
     end
 
     it "uses single quotes to escape 'what<ever'" do
       expect(run("echodo echo 'what<ever'")).to have_output(
-        stderr: "#{COLOR_GREY}echo 'what<ever'#{COLOR_RESET}\n",
+        stderr: "\e[0;2mecho 'what<ever'\e[0m\n",
         stdout: "what<ever\n"
       )
     end
 
     it "uses single quotes to escape 'what\\n\\never'" do
       expect(run("echodo echo 'what\n\never'")).to have_output(
-        stderr: "#{COLOR_GREY}echo 'what\n\never'#{COLOR_RESET}\n",
+        stderr: "\e[0;2mecho 'what\n\never'\e[0m\n",
         stdout: "what\n\never\n"
       )
     end
 
     it "uses single quotes to escape '$dance'" do
       expect(run("echodo echo '$dance'")).to have_output(
-        stderr: "#{COLOR_GREY}echo '$dance'#{COLOR_RESET}\n",
+        stderr: "\e[0;2mecho '$dance'\e[0m\n",
         stdout: "$dance\n"
       )
     end
 
     it %{uses single quotes to escape '"$dance"'} do
       expect(run(%{echodo echo '"$dance"'})).to have_output(
-        stderr: %{#{COLOR_GREY}echo '"$dance"'#{COLOR_RESET}\n},
+        stderr: %{\e[0;2mecho '"$dance"'\e[0m\n},
         stdout: %{"$dance"\n}
       )
     end
 
     it 'uses double quotes to escape single quotes' do
       expect(run("echodo echo don\\'t")).to have_output(
-        stderr: %{#{COLOR_GREY}echo "don't"#{COLOR_RESET}\n},
+        stderr: %{\e[0;2mecho "don't"\e[0m\n},
         stdout: "don't\n"
       )
     end
@@ -171,7 +161,7 @@
     it 'uses single quotes to escape double quotes' do
       expect(run(%{echodo echo 'do or do not there is no "try"'}))
         .to have_output(
-          stderr: %{#{COLOR_GREY}echo 'do or do not there is no "try"'#{COLOR_RESET}\n},
+          stderr: %{\e[0;2mecho 'do or do not there is no "try"'\e[0m\n},
           stdout: %{do or do not there is no "try"\n}
         )
     end
@@ -180,7 +170,7 @@
       # because "\"" works and '\'' doesn't
       expect(run(%{echodo echo "do or don't "'there is no "try"'}))
         .to have_output(
-          stderr: %{#{COLOR_GREY}echo "do or don't there is no \\"try\\""#{COLOR_RESET}\n},
+          stderr: %{\e[0;2mecho "do or don't there is no \\"try\\""\e[0m\n},
           stdout: %{do or don't there is no "try"\n}
         )
     end
@@ -190,7 +180,7 @@
       # so I `set +H` in bash_profile
       # so I don't need to escape `!`
       expect(run(%{echodo echo !})).to have_output(
-        stderr: %{#{COLOR_GREY}echo !#{COLOR_RESET}\n},
+        stderr: %{\e[0;2mecho !\e[0m\n},
         stdout: %{!\n}
       )
     end
diff --git a/spec/git_rubocop_spec.rb b/spec/git_rubocop_spec.rb
index aa9f33c..82ef92a 100644
--- a/spec/git_rubocop_spec.rb
+++ b/spec/git_rubocop_spec.rb
@@ -11,9 +11,7 @@
       AllCops:
         NewCops: enable
     YML
-    run('bundle install')
-    run('bundle lock --add-platform universal-darwin-20')
-    run('bundle lock --add-platform x86_64-darwin-18')
+    run('bundle install --prefer-local', wait: 10)
     git('init')
     git_add('.')
     git_commit('--no-verify -m "Initial commit"')
@@ -74,22 +72,36 @@ def foo()
     file('foo.rb').write(bad_rb)
     file('bar.rb').write(bad_rb)
     git_add('.')
-    run('gc Fail rubocop', expect_exit: be_nonzero)
+    run('gc Fail rubocop', exit_with: be_nonzero)
     run('git_rebasing') # paused rebase for fixing
     file('foo.rb').write(good_rb)
     file('bar.rb').write(good_rb)
-    run('yes | grc')
+    run('grc', wait: 5) do |cmd|
+      expect(cmd).to have_output(stdout: end_with('(1/1) Stage this hunk [y,n,q,a,d,e,?]? '), wait: 10)
+
+      cmd.stdin.puts('y')
+
+      expect(cmd).to have_output(stdout: end_with('(1/1) Stage this hunk [y,n,q,a,d,e,?]? '), wait: 10)
+
+      cmd.stdin.puts('y')
+    end
     expect_clean_git_status
     expect_empty_stash
-    run('git_rebasing', expect_exit: be_nonzero) # no longer rebasing
+    run('git_rebasing', exit_with: be_nonzero) # no longer rebasing
   end
 
   it 'asks to patch add autocorrections when failing the rubocop hook' do
     file('foo.rb').write(bad_autofixable_rb)
     file('bar.rb').write(bad_autofixable_rb)
     git_add('.')
-    run('yes | gc Auto rubocop')
-    run('git_rebasing', expect_exit: be_nonzero) # completed rebase
+    run('gc Auto rubocop') do |cmd|
+      expect(cmd).to have_output(stdout: end_with('(1/1) Stage this hunk [y,n,q,a,d,s,e,?]? '), wait: 10)
+      cmd.stdin.puts('y')
+      expect(cmd).to have_output(stdout: end_with('(1/1) Stage this hunk [y,n,q,a,d,s,e,?]? '), wait: 20)
+      cmd.stdin.puts('y')
+    end
+
+    run('git_rebasing', exit_with: be_nonzero) # completed rebase
     expect_clean_git_status
     expect_empty_stash
 
@@ -102,20 +114,24 @@ def foo()
     file('foo.rb').write(good_rb)
     file('bar.rb').write(bad_rb)
     git_add('foo.rb')
-    run('yes q | gc Pass rubocop', expect_exit: be_nonzero)
+    run('gc Pass rubocop', exit_with: be_nonzero, wait: 10) do |cmd|
+      expect(cmd).to have_output(stdout: end_with('(1/1) Stage addition [y,n,q,a,d,e,?]? '), wait: 10)
+
+      cmd.stdin.puts('q')
+    end
     # it fails due to the rebase not attempting, but does make the commit:
     expect(git_log)
       .to have_output(['Pass rubocop', 'Initial commit'], split: true)
     expect(run('git show --pretty=format: --name-only'))
       .to have_output("foo.rb\n")
 
-    run('git_rebasing', expect_exit: be_nonzero)
+    run('git_rebasing', exit_with: be_nonzero)
     expect(run('git_untracked')).to have_output("bar.rb\n")
 
     # manually lint, TODO: remove this step
     run('git_stash_only_untracked')
     run('git_autolint_head')
-    run('git_rebasing', expect_exit: be_nonzero)
+    run('git_rebasing', exit_with: be_nonzero)
     run('git stash pop')
 
     expect(run('git_untracked')).to have_output("bar.rb\n")
@@ -126,7 +142,11 @@ def foo()
     file('foo.rb').write(good_rb)
     file('bar.rb').write(bad_rb)
     git_add('bar.rb')
-    run('yes q | gc Pass rubocop', expect_exit: be_nonzero)
+    run('gc Pass rubocop', exit_with: be_nonzero, wait: 10) do |cmd|
+      expect(cmd).to have_output(stdout: end_with('(1/1) Stage addition [y,n,q,a,d,e,?]? '), wait: 10)
+
+      cmd.stdin.puts('q')
+    end
     # it fails due to the rebase not attempting, but does make the commit:
     expect(git_log)
       .to have_output(
@@ -135,16 +155,20 @@ def foo()
     expect(run('git show --pretty=format: --name-only'))
       .to have_output("bar.rb\n")
 
-    run('git_rebasing', expect_exit: be_nonzero)
+    run('git_rebasing', exit_with: be_nonzero)
     expect(run('git_untracked')).to have_output("foo.rb\n")
 
     # manually lint, TODO: remove this step
     run('git_stash_only_untracked')
-    run('git_autolint_head', expect_exit: be_nonzero)
+    run('git_autolint_head', exit_with: be_nonzero)
     run('git_rebasing')
     file('bar.rb').write(good_rb)
-    run('yes | grc')
-    run('git_rebasing', expect_exit: be_nonzero)
+    run('grc') do |cmd|
+      expect(cmd).to have_output(stdout: end_with('(1/1) Stage this hunk [y,n,q,a,d,e,?]? '), wait: 10)
+
+      cmd.stdin.puts('y')
+    end
+    run('git_rebasing', exit_with: be_nonzero)
 
     run('git stash pop')
     expect(run('git_untracked')).to have_output("foo.rb\n")
diff --git a/spec/git_spec.rb b/spec/git_spec.rb
index d33890c..aefd99b 100644
--- a/spec/git_spec.rb
+++ b/spec/git_spec.rb
@@ -9,7 +9,7 @@
   describe 'git hooks' do
     it "doesn't stash when aborting commit" do
       create_file path: 'a-file-to-keep'
-      git_commit("-m 'Empty commit that will abort'", expect_exit: 1)
+      git_commit("-m 'Empty commit that will abort'", exit_with: 1)
       expect(git_log).to have_output("Initial commit\n")
       expect(file('a-file-to-keep')).to exist
     end
@@ -46,12 +46,19 @@
       file('file1').write('amended text')
       git_add('file1')
       git_commit("-m 'Commit 3'")
-      expect(git('merge branch2', expect_exit: 1)).to have_output(<<~MESSAGE)
+      expect(git('merge branch2', exit_with: 1)).to have_output(<<~MESSAGE)
         CONFLICT (modify/delete): file1 deleted in branch2 and modified in HEAD.  Version HEAD of file1 left in tree.
         Automatic merge failed; fix conflicts and then commit the result.
       MESSAGE
 
-      expect(run('yes n | gmc')).to have_output(stdout: end_with("Merge branch 'branch2'\n"))
+      expect(
+        run('gmc', wait: 10) do |cmd|
+          expect(cmd).to have_output(stdout: end_with('(1/1) Stage deletion [y,n,q,a,d,?]? '), wait: 10)
+
+          cmd.stdin.puts('n')
+        end
+      ).to have_output(stdout: end_with("Merge branch 'branch2'\n"))
+
 
       expect(git_log).to have_output(
         [
@@ -75,11 +82,18 @@
       git('checkout main')
       git('rm file1')
       git("commit -m 'Commit 3'")
-      expect(git('merge branch2', expect_exit: 1)).to have_output(<<~MESSAGE)
+      expect(git('merge branch2', exit_with: 1)).to have_output(<<~MESSAGE)
         CONFLICT (modify/delete): file1 deleted in HEAD and modified in branch2.  Version branch2 of file1 left in tree.
         Automatic merge failed; fix conflicts and then commit the result.
       MESSAGE
-      expect(run('yes n | gmc')).to have_output(stdout: end_with("Merge branch 'branch2'\n"))
+
+      expect(
+        run('gmc', wait: 10) do |cmd|
+          expect(cmd).to have_output(stdout: end_with('(1/1) Stage addition [y,n,q,a,d,e,?]? '), wait: 10)
+
+          cmd.stdin.puts('n')
+        end
+      ).to have_output(stdout: end_with("Merge branch 'branch2'\n"))
       expect(git_log).to have_output(
         [
           "Merge branch 'branch2'", 'Commit 3', 'Commit 2', 'Commit 1',
@@ -103,11 +117,15 @@
       file('file2').write('something')
       git_add('file2')
       git_commit("-m 'Commit 3'")
-      expect(git('merge branch2', expect_exit: 1)).to have_output(<<~MESSAGE)
+      expect(git('merge branch2', exit_with: 1)).to have_output(<<~MESSAGE)
         CONFLICT (modify/delete): file1 deleted in HEAD and modified in branch2.  Version branch2 of file1 left in tree.
         Automatic merge failed; fix conflicts and then commit the result.
       MESSAGE
-      run('yes | gmc')
+      run('gmc', wait: 10) do |cmd|
+        expect(cmd).to have_output(stdout: end_with('(1/1) Stage addition [y,n,q,a,d,e,?]? '), wait: 10)
+
+        cmd.stdin.puts('y')
+      end
       expect(file('file1')).to exist
       expect(file('file2')).to exist
       expect(git_log).to have_output(
@@ -130,11 +148,15 @@
       file('file1').write('amended text')
       git_add('file1')
       git_commit('-m "Commit 3"')
-      expect(git('merge branch2', expect_exit: 1)).to have_output(<<~MESSAGE)
+      expect(git('merge branch2', exit_with: 1)).to have_output(<<~MESSAGE)
         CONFLICT (modify/delete): file1 deleted in branch2 and modified in HEAD.  Version HEAD of file1 left in tree.
         Automatic merge failed; fix conflicts and then commit the result.
       MESSAGE
-      run('yes | gmc')
+      run('gmc') do |cmd|
+        expect(cmd).to have_output(stdout: end_with('(1/1) Stage deletion [y,n,q,a,d,?]? '), wait: 10)
+
+        cmd.stdin.puts('y')
+      end
       expect(file('file1')).not_to exist
       expect(git_log).to have_output(
         [
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index d6ddfa5..126e98c 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -21,7 +21,7 @@ def warn(msg) # leftovers:allow
 require 'simplecov' if ENV['COVERAGE']
 
 require_relative 'speckly/rspec'
-Speckly.default_max_wait_time = 10
+Speckly.default_max_wait_time = 5
 Speckly.default_command_prefix = []
 
 Dir.glob(File.expand_path('support/**/*.rb', __dir__)).each do |file|
diff --git a/spec/speckly.rb b/spec/speckly.rb
index 0760f5d..431408a 100644
--- a/spec/speckly.rb
+++ b/spec/speckly.rb
@@ -7,16 +7,16 @@
 require_relative 'speckly/session'
 require_relative 'speckly/eventually'
 
-module Speckly
+module Speckly # rubocop:disable Metrics
   @original_working_directory = Dir.pwd
-
-  @default_env = (Bundler ? ::Bundler.original_env.dup : ENV.to_h)
+  @default_env = defined?(Bundler) ? Bundler.original_env.dup : ENV.to_h
+  @default_debug_login_shell = 'bash -l' # TODO: guess which shell they use; https://stackoverflow.com/questions/3327013/how-to-determine-the-current-interactive-shell-that-im-in-command-line
   @default_max_wait_time = 2
   @default_command_prefix = []
 
   class << self
     attr_writer :default_env, :default_max_wait_time, :default_command_prefix
-    attr_accessor :original_working_directory, :current_session
+    attr_accessor :original_working_directory, :current_session, :default_debug_login_shell
 
     def default_env
       @default_env ||= defined?(Bundler) ? ::Bundler.original_env.dup : ENV.to_h.dup
@@ -51,18 +51,34 @@ def cleanup_session
     Speckly.current_session = nil
   end
 
-  def run_command(cmd, *, expect_exit: 0, anywhere: false, chdir: Speckly.session.dir, **) # rubocop:disable Metrics
+  def run_command( # rubocop:disable Metrics
+    cmd,
+    *,
+    exit_with: 0,
+    wait: Speckly.default_max_wait_time,
+    anywhere: false,
+    chdir: Speckly.session.dir,
+    **
+  )
     chdir = Speckly.path(chdir, anywhere:)
     command = Command.new(cmd, *, chdir:, **)
-
     Speckly.session.commands << command
-    Speckly.session.chdir(chdir) { yield command } if block_given?
+    ::Dir.chdir(chdir) { yield command } if block_given?
 
-    expect(command).to have_exitstatus(expect_exit) if expect_exit
+    expect(command).to have_exitstatus(exit_with, wait:) if exit_with
     command
   end
   alias_method :run, :run_command
 
+  def debug(new_login_shell_command = Speckly.default_debug_login_shell) # rubocop:disable Metrics
+    ::Process.wait ::Process.spawn(
+      ::Speckly.default_env,
+      new_login_shell_command,
+      chdir: Speckly.session.dir,
+      unsetenv_others: true
+    )
+  end
+
   def create_file(*lines, path:, anywhere: false) # rubocop:disable Metrics
     path = Speckly.path(path, anywhere:)
     path.parent.mkpath
diff --git a/spec/speckly/command.rb b/spec/speckly/command.rb
index 3ccb684..c86924c 100644
--- a/spec/speckly/command.rb
+++ b/spec/speckly/command.rb
@@ -6,7 +6,7 @@
 module Speckly
   class Command
     def initialize(command, *, merge_output: false, chdir: ::Dir.pwd, env: {}, **) # rubocop:disable Metrics
-      @command = [*Speckly.default_command_prefix, command, *args]
+      @command = [*Speckly.default_command_prefix, command, *]
       @env = ::Speckly.default_env.merge(env.transform_keys(&:to_s)).freeze
       @merge_output = merge_output
       @stdin = ::Speckly::IO.pipe
@@ -14,7 +14,7 @@ def initialize(command, *, merge_output: false, chdir: ::Dir.pwd, env: {}, **) #
       @stderr = merge_output ? @stdout : ::Speckly::IO.pipe
       _, _, @pid = ::PTY.spawn(
         @env,
-        *Speckly.default_command_prefix,
+        *::Speckly.default_command_prefix,
         command,
         *,
         unsetenv_others: true,
diff --git a/spec/speckly/io.rb b/spec/speckly/io.rb
index 3ae24c2..64dfdec 100644
--- a/spec/speckly/io.rb
+++ b/spec/speckly/io.rb
@@ -47,20 +47,20 @@ def inspect
       to_s.inspect
     end
 
-    def print(string)
-      writable?
+    def print(string, wait: Speckly.default_max_wait_time)
+      writable?(wait)
       @io.print(string.dup.force_encoding(Encoding::BINARY))
       @io.flush
     end
 
-    def puts(string)
-      writable?
+    def puts(string, wait: Speckly.default_max_wait_time)
+      writable?(wait)
       @io.puts(string.dup.force_encoding(Encoding::BINARY))
       @io.flush
     end
 
-    def writable?
-      ::IO.select(nil, [@io], nil, 0) # rubocop:disable Lint/IncompatibleIoSelectWithFiberScheduler
+    def writable?(wait)
+      @io.wait_writable(wait)
     end
 
     def readable?
@@ -78,7 +78,7 @@ def close
     private
 
     def buf
-      @buf ||= +''.force_encoding(Encoding::BINARY)
+      @buf ||= (+'').force_encoding(Encoding::BINARY)
     end
 
     def buf_to_s
diff --git a/spec/speckly/session.rb b/spec/speckly/session.rb
index ec5cb86..0621ef9 100644
--- a/spec/speckly/session.rb
+++ b/spec/speckly/session.rb
@@ -21,16 +21,6 @@ def dir
 
     attr_reader :commands
 
-    def chdir(dir, return_if: :block_given?) # rubocop:disable Metrics/MethodLength
-      return_if = block_given? if return_if == :block_given?
-      return_to = ::Dir.pwd if return_if
-      dir = mktmpdir if dir == :temp
-      @dir = Pathname.new(dir)
-      yield if block_given?
-    ensure
-      chdir(return_to) if return_to
-    end
-
     def cleanup
       ::Dir.chdir(@original_dir)
       commands.each(&:cleanup)