TUI: Warm shell completion sources after bootstrap

Co-Authored-By: Oz <oz-agent@warp.dev>

Author: moirahuang

app/src/terminal/model/session.rs

@@ -1726,7 +1726,7 @@ pub fn get_local_hostname() -> Result<String> {
     }
 }
 
-#[cfg(test)]
+#[cfg(any(test, feature = "test-util"))]
 pub mod testing {
     use super::command_executor::testing::TestCommandExecutor;
     use super::*;

app/src/terminal/model/session/command_executor.rs

@@ -349,7 +349,7 @@ fn new_command_executor_for_local_tty_session(
     }
 }
 
-#[cfg(test)]
+#[cfg(any(test, feature = "test-util"))]
 pub mod testing {
     use anyhow::anyhow;
     use command::r#async::Command;

app/src/tui_export.rs

@@ -229,8 +229,8 @@ pub use crate::terminal::model::blocks::{
 pub use crate::terminal::model::escape_sequences::{KeystrokeWithDetails, ToEscapeSequence};
 pub use crate::terminal::model::grid::grid_handler::{GridHandler, TermMode};
 pub use crate::terminal::model::rich_content::RichContentType;
-pub use crate::terminal::model::session::Sessions;
 pub use crate::terminal::model::session::active_session::{ActiveSession, ActiveSessionEvent};
+pub use crate::terminal::model::session::{Session, Sessions, SessionsEvent};
 pub use crate::terminal::model::terminal_model::BlockIndex;
 pub use crate::terminal::model_events::{ModelEvent, ModelEventDispatcher};
 pub use crate::terminal::session_settings::SessionSettings;

crates/warp_tui/src/terminal_session_view.rs

@@ -32,8 +32,8 @@ use warp::tui_export::{
     ParsedSlashCommandInput, PersistenceWriter, PillBarActionKind, PillBarInteractionEvent,
     PillBarPillKind, PillSwitchOutcome, PtyIntent, PtyIntentEvent, QueuedQueryEvent,
     QueuedQueryModel, RepoDetectionSessionType, RepoDetectionSource, ServerConversationToken,
-    SessionSettings, Sessions, ShellCommandExecutorEvent, SizeInfo, SizeUpdate, SkillReference,
-    SlashCommandDataSource as _, SlashCommandKind, SlashCommandSelectionBehavior,
+    SessionSettings, Sessions, SessionsEvent, ShellCommandExecutorEvent, SizeInfo, SizeUpdate,
+    SkillReference, SlashCommandDataSource as _, SlashCommandKind, SlashCommandSelectionBehavior,
     StartAgentExecutorEvent, StartAgentRequest, StaticCommand, TelemetryEvent, TerminalColorList,
     TerminalColors, TerminalModel, TerminalSurface, TerminalSurfaceInit, TranscriptScope,
     TuiMcpAction, TuiMcpManager, TuiMcpServerId, TuiMcpVariableValue, TuiSlashCommandDataSource,
@@ -1989,6 +1989,7 @@ impl TuiTerminalSessionView {
             }
             ModelEvent::AfterBlockCompleted(completed) => {
                 view.emit_block_completed_telemetry(completed, ctx);
+                view.ensure_external_commands_are_warming(ctx);
             }
             ModelEvent::AfterBlockStarted { .. } => {
                 view.refresh_input_focus(ctx);
@@ -2044,6 +2045,26 @@ impl TuiTerminalSessionView {
                 ctx.notify();
             }
         });
+        ctx.subscribe_to_model(&sessions, |view, _, event, ctx| match event {
+            SessionsEvent::SessionBootstrapped(bootstrap_event)
+                if view.active_session.as_ref(ctx).session_id(ctx)
+                    == Some(bootstrap_event.session_id) =>
+            {
+                let Some(session) = view.sessions.as_ref(ctx).get(bootstrap_event.session_id)
+                else {
+                    report_error!(
+                        "Could not find active TUI session after its bootstrap event",
+                        extra: { "session_id" => ?bootstrap_event.session_id }
+                    );
+                    return;
+                };
+                view.abort_shell_completion(ctx);
+                view.warm_shell_completion_sources(session, ctx);
+            }
+            SessionsEvent::SessionBootstrapped(_)
+            | SessionsEvent::SessionInitialized { .. }
+            | SessionsEvent::EnvironmentVariablesUpdated { .. } => {}
+        });
         ctx.subscribe_to_model(&active_session, |view, _, event, ctx| match event {
             ActiveSessionEvent::UpdatedPwd => {
                 view.abort_shell_completion(ctx);
@@ -2086,7 +2107,7 @@ impl TuiTerminalSessionView {
                 });
                 ctx.notify();
             }
-            ActiveSessionEvent::Bootstrapped => view.abort_shell_completion(ctx),
+            ActiveSessionEvent::Bootstrapped => {}
         });
         // The footer's usage entry shows the selected conversation's token/cost
         // totals: re-render when that conversation's usage metadata updates.
@@ -2198,6 +2219,9 @@ impl TuiTerminalSessionView {
         if let Some(error) = initial_settings_file_error {
             view.show_settings_file_error(&error, ctx);
         }
+        if let Some(session) = view.active_session.as_ref(ctx).session(ctx) {
+            view.warm_shell_completion_sources(session, ctx);
+        }
         view
     }
 

crates/warp_tui/src/terminal_session_view/completions.rs

@@ -1,6 +1,8 @@
 //! Asynchronous shell-command completion coordination for the TUI composer.
 
-use warp::tui_export::{longest_common_prefix, tui_completion_session_context};
+use std::sync::Arc;
+
+use warp::tui_export::{Session, longest_common_prefix, tui_completion_session_context};
 use warp_completer::completer::{
     CompleterOptions, EngineFileType, Match, SuggestionResults, suggestions,
 };
@@ -29,6 +31,40 @@ struct CompletionRequestSnapshot {
 }
 
 impl TuiTerminalSessionView {
+    pub(super) fn warm_shell_completion_sources(
+        &self,
+        session: Arc<Session>,
+        ctx: &mut ViewContext<Self>,
+    ) {
+        let function_names_session = session.clone();
+        let builtins_session = session.clone();
+
+        ctx.spawn(
+            async move { session.load_external_commands().await },
+            |_, _, _| {},
+        );
+        ctx.background_executor()
+            .spawn(async move { function_names_session.load_all_function_names().await })
+            .detach();
+        ctx.background_executor()
+            .spawn(async move { builtins_session.load_all_builtins().await })
+            .detach();
+    }
+
+    pub(super) fn ensure_external_commands_are_warming(&self, ctx: &mut ViewContext<Self>) {
+        let Some(session) = self.active_session.as_ref(ctx).session(ctx) else {
+            return;
+        };
+        if session.has_attempted_to_load_external_commands() {
+            return;
+        }
+
+        ctx.spawn(
+            async move { session.load_external_commands().await },
+            |_, _, _| {},
+        );
+    }
+
     pub(super) fn request_shell_completion(&mut self, ctx: &mut ViewContext<Self>) {
         if active_inline_menu(
             &self.inline_menus,

crates/warp_tui/src/terminal_session_view_tests.rs

@@ -20,7 +20,7 @@ use warp::tui_export::{
     AIConversationAutoexecuteMode, AIConversationId, AgentViewEntryOrigin, BlockPadding,
     BlocklistAIHistoryEvent, BlocklistAIHistoryModel, ConversationStatus, ConversationUsageTotals,
     Harness, InputTypeAutoDetectionSource, LLMPreferences, LinkedWorkflowData,
-    LongRunningCommandControlState, PtyIntent, PtyIntentEvent, SizeInfo, SizeUpdate,
+    LongRunningCommandControlState, PtyIntent, PtyIntentEvent, Session, SizeInfo, SizeUpdate,
     SlashCommandDataSource as _, SlashCommandKind, TaskId, TranscriptScope, TuiMcpAction,
     TuiMcpServerId, TuiUpArrowHistoryItemKind, UserTakeOverReason, WarpConfig,
     WarpConfigUpdateEvent, export_conversation_markdown, light_theme,
@@ -852,6 +852,27 @@ fn shell_mode_reserves_tab_even_when_attachments_render() {
     assert!(!attachment_focus_available(true, true));
     assert!(!attachment_focus_available(false, false));
 }
+#[test]
+fn shell_completion_source_warmup_loads_path_executables() {
+    App::test((), |mut app| async move {
+        let fixture = focus_test_fixture(&mut app);
+        let (view, _) = add_focus_test_session(&mut app, &fixture, true);
+        let session = Arc::new(Session::test());
+
+        view.update(&mut app, |view, ctx| {
+            view.warm_shell_completion_sources(session.clone(), ctx);
+        });
+
+        let deadline = Instant::now() + Duration::from_secs(5);
+        while !session.has_loaded_external_commands() && Instant::now() < deadline {
+            Timer::after(Duration::from_millis(10)).await;
+        }
+
+        assert!(session.has_attempted_to_load_external_commands());
+        assert!(session.has_loaded_external_commands());
+        assert!(session.executable_names().any(|command| command == "git"));
+    });
+}
 
 #[test]
 fn nld_reset_only_unlocks_after_agent_control_and_not_on_user_edit() {