first pass of merging in warp (doesn't build)

crates/integration/tests/integration/shell_integration_tests.rs

@@ -48,6 +48,8 @@ integration_tests! {
     test_warp_honors_user_title_bash,
     // Tests zsh-specific behavior.
     test_warp_honors_user_title_zsh,
+    // Tests OSC 7 updates the block's working directory on bash and zsh.
+    test_osc7_updates_current_working_directory,
     // Tests shell-specific "autocd" behavior.
     test_completions_with_autocd,
     // Tests bootstrap reports completable executables.
@@ -77,19 +79,29 @@ integration_tests! {
     test_zsh_bootstraps_with_nounset_option,
 
     // Tests of ssh wrapper logic from bootstrap script.
-    test_legacy_ssh_into_bash,
-    test_legacy_ssh_into_zsh,
-    test_tmux_ssh_into_bash,
-    test_tmux_ssh_into_zsh,
+    test_ssh_wrapper_into_bash,
+    test_ssh_wrapper_into_zsh,
     // TODO(vorporeal): Reenable fish once we actually support it as a remote
     // shell.
     // test_ssh_into_fish,
     test_ssh_into_sh,
     test_ssh_into_ash,
 
+    // Tests of remote server behavior.
+    test_remote_server_connect_bash,
+    test_remote_server_connect_zsh,
+    test_remote_server_navigate_to_repo,
+    test_remote_server_completions,
+    test_remote_server_file_operations,
+    test_remote_server_lazy_load_directory,
+
     // Tests of custom prompt behavior.
     test_copy_prompt_from_block_honor_ps1_enabled,
     test_copy_prompt_from_input_honor_ps1_enabled,
+    test_copy_block_command_and_output_honor_ps1_disabled,
+    test_copy_block_command_and_output_honor_ps1_enabled,
+    // Tests zsh-specific right-prompt behavior in Warp prompt mode.
+    test_warp_prompt_unsets_zsh_rprompt,
 
     // Disabled due to flakiness on CI.
     #[ignore]

crates/integration/tests/integration/ui_tests.rs

@@ -140,6 +140,9 @@ integration_tests! {
     test_open_input_context_menu,
     test_copy_all_from_input_context_menu,
     test_cut_paste_from_input_context_menu,
+    test_inline_model_selector_restores_prompt_on_dismissal,
+    test_inline_model_selector_restores_prompt_on_model_selection,
+    test_inline_model_selector_restores_prompt_on_chip_toggle_close,
     test_paste_and_type_characters_before_bootstrap,
     #[ignore = "Flaking on CI - KC looking into 3/31/26"]
     test_code_review_scroll_anchor_preserved_when_inserting_above,
@@ -209,10 +212,18 @@ integration_tests! {
     test_secrets_are_always_redacted_in_ai_inputs,
 
     test_active_session_follows_focus,
+    test_tab_context_menu_copies_metadata,
+    test_vertical_tab_context_menu_copies_metadata,
+    test_vertical_pane_context_menu_copies_metadata,
 
     test_focus_panes_on_hover,
 
     test_close_tab_with_long_running_process,
+    test_reorder_tabs_with_drag,
+    test_detach_tab_to_new_window_with_drag,
+    test_attach_tab_to_other_window_and_continue_drag,
+    test_single_tab_handoff_continues_drag,
+    test_multi_tab_drag_back_to_source_and_out_again,
 
     test_restore_single_closed_pane,
     test_restore_multiple_closed_panes,
@@ -224,7 +235,7 @@ integration_tests! {
     test_close_notebook_tab,
     test_open_in_warp_banner,
     test_close_notebook_window,
-    test_backspace_inside_rendered_mermaid_block_is_atomic,
+    test_backspace_inside_raw_mermaid_block_edits_text_without_removing_block,
 
     test_open_workflow_in_pane,
     test_create_personal_workflow_pane_from_command_palette,
@@ -255,6 +266,7 @@ integration_tests! {
     test_settings_error_banner_on_reload_with_invalid_toml,
     test_settings_error_banner_on_reload_with_invalid_value,
 
+    test_copy_selection_within_ai_block,
     #[ignore = "Affected by agent_view feature flag UI changes"]
     test_selection_first_to_last_through_ai_simple,
     #[ignore = "Affected by agent_view feature flag UI changes"]
@@ -296,7 +308,7 @@ integration_tests! {
     test_restored_ai_block_renders_mermaid_and_local_images,
 
     // Middle-click-paste is only implemented for Linux right now.
-    #[cfg(target_os = "linux")]
+    #[cfg(any(target_os = "linux", target_os = "freebsd"))]
     test_middle_click_paste,
     test_agent_mode_pane_minimum_size,
 
@@ -317,6 +329,11 @@ integration_tests! {
     test_goto_line_jumps_to_line,
     test_goto_line_with_column,
     test_goto_line_clamps_out_of_range,
+    test_code_editor_line_numbers_default_to_absolute,
+    test_code_editor_relative_line_numbers_follow_cursor,
+
+    // AI document tests
+    test_copy_ai_document_as_markdown_from_overflow_menu,
 
     // Keyboard protocol tests
     test_keyboard_protocol_disabled_shift_enter,
@@ -332,4 +349,9 @@ integration_tests! {
     // Video recording test — requires real display, run manually
     #[ignore = "Manual test: requires real display for frame capture"]
     test_video_recording,
+
+    // Rich Input Ctrl+Enter submit toggle (issue #11588)
+    test_rich_input_toggle_on_enter_inserts_newline_and_ctrl_enter_submits,
+    // Regression: Enter must accept inline menus (not insert newline) when toggle=true
+    test_rich_input_enter_accepts_menu_item_when_toggle_is_true,
 }