Shell widget handoff: hand ctrl-r and ctrl-t to fzf/atuin (CORE-3807)

app/Cargo.toml

@@ -1053,6 +1053,7 @@ git_credential_refresh = []
 prompt_cache_expiry_warning = []
 osc_hyperlinks = []
 ctrl_c_cancels_third_party_harness = []
+shell_widget_handoff = []
 
 [package.metadata.bundle.bin.warp-oss]
 category = "public.app-category.developer-tools"

app/assets/bundled/bootstrap/bash_body.sh

@@ -970,6 +970,41 @@ if [ -z "$WARP_BOOTSTRAPPED" ]; then
         READLINE_LINE=""
     }
 
+    # Runs the shell's ctrl-r history widget as a foreground command.
+    warp_run_external_ctrl_r_widget () {
+        local result=""
+        case "$_WARP_EXTERNAL_CTRL_R_WIDGET" in
+          __fzf_history__)
+            result="$(__fzf_history__)"
+            ;;
+          __atuin_history)
+            # Bypass atuin's own bash key-binding machinery entirely and invoke the underlying
+            # `atuin search` command directly, exactly as atuin's own integration does
+            # (__atuin_search_cmd's non-tmux branch).
+            result="$(ATUIN_SHELL=bash atuin search -i 3>&1 1>&2 2>&3 3>&-)"
+            # If the user has atuin's enter_accept config on, Enter both selects and runs the
+            # command, signaled by this prefix; we only ever want the selection, never to run
+            # it, so strip the prefix in both cases (see atuin's __atuin_history for the same
+            # check).
+            result="${result#__atuin_accept__:}"
+            ;;
+        esac
+        local warp_escaped_selection="$(warp_escape_json "$result")"
+        warp_send_json_message "{ \"hook\": \"ExternalShellWidgetSelection\", \"value\": { \"buffer\": \"$warp_escaped_selection\", \"session_id\": $WARP_SESSION_ID } }"
+    }
+
+    # Runs the shell's own ctrl-t file-search widget as a foreground command.
+    warp_run_external_ctrl_t_widget () {
+        local result=""
+        case "$_WARP_EXTERNAL_CTRL_T_WIDGET" in
+          fzf-file-widget)
+            result="$(__fzf_select__)"
+            ;;
+        esac
+        local warp_escaped_selection="$(warp_escape_json "$result")"
+        warp_send_json_message "{ \"hook\": \"ExternalShellWidgetSelection\", \"value\": { \"buffer\": \"$warp_escaped_selection\", \"session_id\": $WARP_SESSION_ID } }"
+    }
+
     # Check whether the prompt-related variables have OSC prompt marker sequences,
     # and if not, wrap them with the appropriate markers so that we can direct the
     # prompt bytes to the appropriate grids.
@@ -1407,13 +1442,13 @@ esac
     # rcfiles.
     USER_HISTCONTROL="$HISTCONTROL"
 
-    # Add a pattern to ignore in-band commands in shell history, while preserving the user's
+    # Add patterns to ignore in-band commands in shell history, while preserving the user's
     # HISTIGNORE value which may been set in an RC file sourced above. It is important to
     # ensure that this happens _after_ the user's RC files have been sourced.
     if [[ ! -z $HISTIGNORE ]]; then
-        HISTIGNORE="*warp_run_generator_command*:$HISTIGNORE"
+        HISTIGNORE="*warp_run_generator_command*:*warp_run_external_ctrl_r_widget*:*warp_run_external_ctrl_t_widget*:$HISTIGNORE"
     else
-        HISTIGNORE="*warp_run_generator_command*"
+        HISTIGNORE="*warp_run_generator_command*:*warp_run_external_ctrl_r_widget*:*warp_run_external_ctrl_t_widget*"
     fi
 
     # If the user has PROMPT_COMMAND set in their bootstrap scripts,
@@ -1528,6 +1563,38 @@ esac
 
     shell_plugins=()
 
+    # Detect whether ctrl-r has been rebound to fzf's or atuin's bash history widget, so Warp
+    # can hand ctrl-r off to it.
+    _WARP_EXTERNAL_CTRL_R_WIDGET=""
+    if [ "$WARP_IN_MSYS2" = false ]; then
+      warp_ctrl_r_binding="$(bind -X 2>/dev/null | command -p sed -n 's/^"\\C-r"[ :] *"\(.*\)"$/\1/p')"
+      case "$warp_ctrl_r_binding" in
+        __fzf_history__|__atuin_history)
+          _WARP_EXTERNAL_CTRL_R_WIDGET="$warp_ctrl_r_binding"
+          shell_plugins+=(external_ctrl_r_history)
+          ;;
+      esac
+      # atuin >= 18.10 binds ctrl-r through the indirect dispatcher above rather than a plain
+      # `bind -x`. Instead use atuin's own init-time flag ($__atuin_bind_ctrl_r) plus
+        # __atuin_history being defined.
+      if [ -z "$_WARP_EXTERNAL_CTRL_R_WIDGET" ] && [ "$__atuin_bind_ctrl_r" = true ] &&
+        declare -F __atuin_history >/dev/null; then
+        _WARP_EXTERNAL_CTRL_R_WIDGET="__atuin_history"
+        shell_plugins+=(external_ctrl_r_history)
+      fi
+
+      _WARP_EXTERNAL_CTRL_T_WIDGET=""
+      warp_ctrl_t_binding="$(bind -X 2>/dev/null | command -p sed -n 's/^"\\C-t"[ :] *"\(.*\)"$/\1/p')"
+      case "$warp_ctrl_t_binding" in
+        fzf-file-widget)
+          if declare -F __fzf_select__ >/dev/null; then
+            _WARP_EXTERNAL_CTRL_T_WIDGET="$warp_ctrl_t_binding"
+            shell_plugins+=(external_ctrl_t_file)
+          fi
+          ;;
+      esac
+    fi
+
     function warp_bootstrapped () {
         local aliases="`alias`"
         local env_var_names="`compgen -e`"

app/assets/bundled/bootstrap/fish.sh

@@ -551,6 +551,114 @@ function warp_escape_json
     string join \n $argv | command sed -E 's/(["\\\\])/\\\\\\1/g; s/'\b'/\\\\b/g; s/'\t'/\\\\t/g; s/'\f'/\\\\f/g; s/'\r'/\\\\r/g; $!s/$/\\\\n/' | command tr -d '\n'
 end
 
+# Reports the widget `^R` is bound to, if the user has rebound it away from fish's own
+# history search. Returns non-zero when `^R` is still on a fish default.
+function warp_external_ctrl_r_widget
+  # fish >= 4.0 renamed key specifications, so `bind` echoes back `ctrl-r` where earlier
+  # versions echo `\cr`.
+  set -l widget ""
+  for binding in (bind \cr 2>/dev/null)
+    if string match --quiet -- 'bind --preset *' "$binding"
+      continue
+    end
+    # Strip the leading `bind [-M <mode>] <key>`, leaving just the widget/command.
+    set widget (string replace --regex -- '^bind (-M \S+ +)?\S+ +' '' "$binding")
+  end
+  test -n "$widget"; or return 1
+  echo "$widget"
+end
+
+# Reports the widget `^T` is bound to, if the user has rebound it away from fish's default (no
+# binding at all). Returns non-zero when `^T` has no non-preset binding.
+function warp_external_ctrl_t_widget
+  set -l widget ""
+  for binding in (bind \ct 2>/dev/null)
+    if string match --quiet -- 'bind --preset *' "$binding"
+      continue
+    end
+    set widget (string replace --regex -- '^bind (-M \S+ +)?\S+ +' '' "$binding")
+  end
+  test -n "$widget"; or return 1
+  echo "$widget"
+end
+
+# Runs the shell's own ctrl-r history tool as a foreground command.
+function warp_run_external_ctrl_r_widget
+  set -l result ""
+  switch "$_WARP_EXTERNAL_CTRL_R_WIDGET"
+    case 'fzf-history-widget'
+      test -z "$fish_private_mode"; and builtin history merge
+      fzf-history-widget
+      set result (commandline | string collect)
+      commandline -r ''
+    case '_atuin_search'
+      # atuin writes its TUI to stdout and the selection to fd 3, so the two are swapped here to
+      # leave the UI on the terminal and capture only the selection.
+      set -l output (ATUIN_SHELL_FISH=t ATUIN_LOG=error atuin search -i 3>&1 1>&2 2>&3 | string collect)
+      # atuin prefixes the selection with __atuin_accept__: when `enter_accept` is on and the
+      # user pressed enter. Warp always inserts without executing, so the prefix is dropped.
+      set result (string replace "__atuin_accept__:" "" -- "$output" | string collect)
+  end
+  set -l warp_escaped_selection (warp_escape_json "$result")
+  warp_send_json_message "{ \"hook\": \"ExternalShellWidgetSelection\", \"value\": { \"buffer\": \"$warp_escaped_selection\", \"session_id\": $WARP_SESSION_ID } }"
+end
+
+function warp_ctrl_t_widget_result
+  test "$argv[1]" = "$argv[2]"; or string collect -- "$argv[2]"
+end
+
+# Runs fzf directly against a find-style command as a foreground command.
+function warp_run_external_ctrl_t_widget
+  set -l result ""
+  switch "$_WARP_EXTERNAL_CTRL_T_WIDGET"
+    case 'fzf-file-widget'
+      set -l warp_ctrl_t_parts (string split -m 1 -- ':' "$argv[1]")
+      set -l char_cursor $warp_ctrl_t_parts[1]
+      set -l original_line (warp_hex_decode_string $warp_ctrl_t_parts[2] | string collect --no-trim-newlines --allow-empty)
+      commandline -r -- $original_line
+      commandline -C -- $char_cursor
+      fzf-file-widget
+      set -l cl_readback (commandline | string collect)
+      set result (warp_ctrl_t_widget_result "$original_line" "$cl_readback")
+      commandline -r ''
+  end
+  set -l warp_escaped_selection (warp_escape_json "$result")
+  warp_send_json_message "{ \"hook\": \"ExternalShellWidgetSelection\", \"value\": { \"buffer\": \"$warp_escaped_selection\", \"session_id\": $WARP_SESSION_ID } }"
+end
+
+# Exclude the ctrl-r/ctrl-t external handoff helpers (see warp_run_external_ctrl_r_widget/
+# warp_run_external_ctrl_t_widget above) from the user's history.
+#
+# fish only supports a single fish_should_add_to_history function (unlike zsh's array of
+# zshaddhistory hooks or bash's PROMPT_COMMAND-style stacking), so compose with any
+# user-defined one -- e.g. from a plugin sourced in config.fish before this bootstrap script
+# runs -- rather than clobbering it, following the same backup pattern warp_update_prompt_vars
+# uses for fish_prompt.
+#
+# warp_original_fish_should_add_to_history must exist and be safe to call *before* we install our
+# own wrapper below. This bootstrap script can run more than once in the same fish process (a
+# shell reload, or a nested fish subshell), and a user or plugin can define or replace
+# fish_should_add_to_history at any point, including between two of our sourcings -- so on every
+# run, re-derive the backup from whatever fish_should_add_to_history currently is, unless that's
+# already our own wrapper from a previous run (identified by the warp_run_external_ctrl_r_widget
+# sentinel in its body), in which case the existing backup -- the last real hook we captured, or
+# the accept-everything default if none ever existed -- is left alone. Backing up our own wrapper
+# as if it were the original would make every history check call itself.
+if functions -q fish_should_add_to_history
+  and not functions fish_should_add_to_history | string match --quiet -- '*warp_run_external_ctrl_r_widget*'
+  functions -q warp_original_fish_should_add_to_history; and functions -e warp_original_fish_should_add_to_history
+  functions -c fish_should_add_to_history warp_original_fish_should_add_to_history
+else if not functions -q warp_original_fish_should_add_to_history
+  function warp_original_fish_should_add_to_history
+    return 0
+  end
+end
+function fish_should_add_to_history
+  string match --quiet -- '*warp_run_external_ctrl_r_widget*' $argv[1]; and return 1
+  string match --quiet -- '*warp_run_external_ctrl_t_widget*' $argv[1]; and return 1
+  warp_original_fish_should_add_to_history $argv
+end
+
 function warp_bootstrapped
   set -l histfile_directory
   set histfile_directory "$XDG_DATA_HOME"
@@ -564,6 +672,26 @@ function warp_bootstrapped
       set vi_mode_enabled "1"
   end
 
+  set -l shell_plugins
+  set -g _WARP_EXTERNAL_CTRL_R_WIDGET ""
+  set -l warp_ctrl_r_widget (warp_external_ctrl_r_widget)
+  switch "$warp_ctrl_r_widget"
+    case 'fzf-history-widget' '_atuin_search'
+      set -g _WARP_EXTERNAL_CTRL_R_WIDGET "$warp_ctrl_r_widget"
+      set -a shell_plugins external_ctrl_r_history
+  end
+
+  set -g _WARP_EXTERNAL_CTRL_T_WIDGET ""
+  set -l warp_ctrl_t_widget (warp_external_ctrl_t_widget)
+  switch "$warp_ctrl_t_widget"
+    case 'fzf-file-widget'
+      if functions -q fzf-file-widget
+        set -g _WARP_EXTERNAL_CTRL_T_WIDGET "$warp_ctrl_t_widget"
+        set -a shell_plugins external_ctrl_t_file
+      end
+  end
+  set -l escaped_shell_plugins (warp_escape_json $shell_plugins)
+
   set -l kernel_name (uname)
   if test -n "$kernel_name"
     if [ "$kernel_name" = "Darwin" ]
@@ -593,7 +721,7 @@ function warp_bootstrapped
   # part of its builtins (e.g. "for", "while", etc.).
   set -l escaped_editor (warp_escape_json "$EDITOR")
   set -l escaped_shell_path (warp_escape_json (status fish-path))
-  set -l escaped_json "{\"hook\": \"Bootstrapped\", \"value\": {\"histfile\": \"$escaped_histfile\", \"session_id\": $WARP_SESSION_ID, \"shell\": \"fish\", \"home_dir\": \"$HOME\", \"path\": \"$PATH\", \"editor\": \"$escaped_editor\", \"abbreviations\": \"$escaped_abbr\", \"aliases\": \"$escaped_aliases\", \"function_names\": \"$function_names\", \"env_var_names\": \"$env_var_names\", \"builtins\": \"$escaped_builtins\", \"keywords\": \"\", \"shell_version\": \"$FISH_VERSION\", \"vi_mode_enabled\": \"$vi_mode_enabled\", \"os_category\": \"$os_category\", \"linux_distribution\": \"$linux_distribution\", \"wsl_name\": \"$WSL_DISTRO_NAME\", \"shell_path\": \"$escaped_shell_path\"}}"
+  set -l escaped_json "{\"hook\": \"Bootstrapped\", \"value\": {\"histfile\": \"$escaped_histfile\", \"session_id\": $WARP_SESSION_ID, \"shell\": \"fish\", \"home_dir\": \"$HOME\", \"path\": \"$PATH\", \"editor\": \"$escaped_editor\", \"abbreviations\": \"$escaped_abbr\", \"aliases\": \"$escaped_aliases\", \"function_names\": \"$function_names\", \"env_var_names\": \"$env_var_names\", \"builtins\": \"$escaped_builtins\", \"keywords\": \"\", \"shell_version\": \"$FISH_VERSION\", \"shell_plugins\": \"$escaped_shell_plugins\", \"vi_mode_enabled\": \"$vi_mode_enabled\", \"os_category\": \"$os_category\", \"linux_distribution\": \"$linux_distribution\", \"wsl_name\": \"$WSL_DISTRO_NAME\", \"shell_path\": \"$escaped_shell_path\"}}"
   warp_send_json_message $escaped_json
 end
 

app/assets/bundled/bootstrap/zsh_body.sh

@@ -710,6 +710,48 @@ if [[ -z $WARP_BOOTSTRAPPED ]]; then
   }
   zle -N warp_report_input
 
+  # Runs the shell's own ctrl-r history widget as a foreground command.
+  function warp_run_external_ctrl_r_widget () {
+    local result=""
+    case "$_WARP_EXTERNAL_CTRL_R_WIDGET" in
+      fzf-history-widget)
+        result="$(fc -rl 1 \
+          | command -p awk '{ cmd=$0; sub(/^[ \t]*[0-9]+\**[ \t]+/, "", cmd); if (!seen[cmd]++) print cmd }' \
+          | fzf --scheme=history --tiebreak=index +m)"
+        ;;
+      atuin-search|atuin-search-viins|atuin-search-vicmd|_atuin_search_widget)
+        # atuin writes its TUI to stdout; under plain command substitution that's a pipe, and
+        # its cursor-position query (\x1b[6n) has nothing to answer it, so it bails during
+        # startup. Swap stdout/stderr through fd 3, matching atuin's own zsh integration
+        # (_atuin_search -> __atuin_search_cmd), so the TUI reaches the tty while the
+        # selection is still captured via command substitution.
+        result="$(ATUIN_SHELL=zsh atuin search -i 3>&1 1>&2 2>&3 3>&-)"
+        # If the user has atuin's enter_accept config on, Enter both selects and runs the
+        # command, signaled by this prefix; we only ever want the selection, never to run it,
+        # so strip the prefix in both cases (see atuin's _atuin_search for the same check).
+        result="${result#__atuin_accept__:}"
+        ;;
+    esac
+    local warp_escaped_selection="$(warp_escape_json "$result")"
+    warp_send_json_message "{ \"hook\": \"ExternalShellWidgetSelection\", \"value\": { \"buffer\": \"$warp_escaped_selection\", \"session_id\": $WARP_SESSION_ID } }"
+  }
+
+  # Runs the shell's own ctrl-t file-search widget as a foreground command.
+  function warp_run_external_ctrl_t_widget () {
+    local result=""
+    case "$_WARP_EXTERNAL_CTRL_T_WIDGET" in
+      fzf-file-widget)
+        if (( $+functions[__fzf_select] )); then
+          result="$(__fzf_select)"
+        else  # fzf < 0.48
+          result="$(__fsel)"
+        fi
+        ;;
+    esac
+    local warp_escaped_selection="$(warp_escape_json "$result")"
+    warp_send_json_message "{ \"hook\": \"ExternalShellWidgetSelection\", \"value\": { \"buffer\": \"$warp_escaped_selection\", \"session_id\": $WARP_SESSION_ID } }"
+  }
+
   function clear() {
       warp_send_json_message "{\"hook\": \"Clear\", \"value\": {\"session_id\": $WARP_SESSION_ID}}"
   }
@@ -1279,7 +1321,8 @@ esac
   # See https://zsh.sourceforge.io/Doc/Release/Functions.html for more context
   # on the zshaddhistory hook.
   _warp_zshaddhistory() {
-    _is_warp_generator_command "$1"
+    _is_warp_generator_command "$1" && [[ "$1" != *"warp_run_external_ctrl_r_widget"* ]] && \
+      [[ "$1" != *"warp_run_external_ctrl_t_widget"* ]]
   }
 
   # Register this zshaddhistory hook after the user's RC files have been sourced,
@@ -1353,6 +1396,34 @@ esac
     shell_plugins+=(vi)
   fi
 
+  # Detect whether ctrl-r has been rebound to fzf's or atuin's history widget.
+  _WARP_EXTERNAL_CTRL_R_WIDGET=""
+  warp_ctrl_r_binding="$(bindkey -M main '^R' 2>/dev/null)"
+  if [[ "$warp_ctrl_r_binding" == '"^R" '* ]]; then
+    warp_ctrl_r_widget="${warp_ctrl_r_binding#\"^R\" }"
+    case "$warp_ctrl_r_widget" in
+      fzf-history-widget|atuin-search|atuin-search-viins|atuin-search-vicmd|_atuin_search_widget)
+        _WARP_EXTERNAL_CTRL_R_WIDGET="$warp_ctrl_r_widget"
+        shell_plugins+=(external_ctrl_r_history)
+        ;;
+    esac
+  fi
+
+  # Detect whether ctrl-t has been rebound to fzf's file-search widget.
+  _WARP_EXTERNAL_CTRL_T_WIDGET=""
+  warp_ctrl_t_binding="$(bindkey -M main '^T' 2>/dev/null)"
+  if [[ "$warp_ctrl_t_binding" == '"^T" '* ]]; then
+    warp_ctrl_t_widget="${warp_ctrl_t_binding#\"^T\" }"
+    case "$warp_ctrl_t_widget" in
+      fzf-file-widget)
+        if (( $+functions[__fzf_select] )) || (( $+functions[__fsel] )); then
+          _WARP_EXTERNAL_CTRL_T_WIDGET="$warp_ctrl_t_widget"
+          shell_plugins+=(external_ctrl_t_file)
+        fi
+        ;;
+    esac
+  fi
+
   if kernel_name="$(uname)"; then
     if [[ "$kernel_name" == "Darwin" ]]; then
       os_category="MacOS"

app/src/features.rs

@@ -525,6 +525,8 @@ fn enabled_features() -> HashSet<FeatureFlag> {
         FeatureFlag::TerminalLifecycleRecovery,
         #[cfg(feature = "ctrl_c_cancels_third_party_harness")]
         FeatureFlag::CtrlCCancelsThirdPartyHarness,
+        #[cfg(feature = "shell_widget_handoff")]
+        FeatureFlag::ShellWidgetHandoff,
     ]);
 
     flags

app/src/terminal/event.rs

@@ -9,7 +9,7 @@ pub use warp_terminal::event::{ExecutedExecutorCommandEvent, ParseGeneratorOutpu
 use warp_util::lazy::Lazy;
 
 use super::history::HistoryEntry;
-use super::model::ansi::FinishUpdateValue;
+use super::model::ansi::{ExternalShellWidgetSelectionValue, FinishUpdateValue};
 use super::model::block::BlockId;
 use super::model::lifecycle::LifecycleRecoveryRecord;
 use super::model::session::{SessionId, SessionInfo};
@@ -128,6 +128,7 @@ pub enum Event {
     /// Emitted when the assisted auto-update has completed and we're ready to
     /// relaunch the app.
     FinishUpdate(FinishUpdateValue),
+    ExternalShellWidgetSelection(ExternalShellWidgetSelectionValue),
     TextSelectionChanged,
     ShellSpawned(ShellType),
     ImageReceived {
@@ -475,6 +476,13 @@ impl Debug for Event {
                 )
             }
             Event::FinishUpdate(data) => write!(f, "FinishUpdate({})", data.update_id),
+            Event::ExternalShellWidgetSelection(data) => {
+                write!(
+                    f,
+                    "ExternalShellWidgetSelection(buffer_len: {})",
+                    data.buffer.len()
+                )
+            }
             Event::TextSelectionChanged => write!(f, "TextSelectionChanged"),
             Event::ShellSpawned(shell_type) => write!(f, "ShellSpawned({shell_type:?})"),
             Event::ImageReceived { image_id, .. } => {