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

app/src/ai/predict/generate_ai_input_suggestions.rs

@@ -3,13 +3,13 @@
 
 mod api;
 
-pub use api::*;
+use std::sync::Arc;
 
+pub use api::*;
 use chrono::NaiveDateTime;
 use itertools::Itertools;
 use parking_lot::FairMutex;
 use serde::{Deserialize, Serialize};
-use std::sync::Arc;
 
 use crate::ai_assistant::execution_context::WarpAiExecutionContext;
 use crate::terminal::model::block::BlockState;
@@ -209,5 +209,5 @@ pub fn create_generate_ai_input_suggestions_request(
 }
 
 #[cfg(test)]
-#[path = "generate_ai_input_suggestions_test.rs"]
+#[path = "generate_ai_input_suggestions_tests.rs"]
 mod tests;

app/src/ai/predict/generate_am_query_suggestions/api/response.rs

@@ -57,7 +57,7 @@ impl From<GeneratedFileLocations> for FileLocations {
     fn from(value: GeneratedFileLocations) -> Self {
         Self {
             name: value.file_name,
-            // We are explicitly disgarding the line_numbers right now.
+            // We are explicitly discarding the line_numbers right now.
             // TODO(kevin): Convert them into Range<usize>.
             lines: Vec::new(),
         }

app/src/ai/predict/next_command_model.rs

@@ -1,14 +1,8 @@
-use crate::ai::block_context::BlockContext;
-use crate::ai_assistant::execution_context::WarpAiExecutionContext;
-use crate::completer::SessionContext;
-use crate::report_error;
-use crate::server::server_api::{AIApiError, ServerApi};
-use crate::settings::AISettings;
-use crate::terminal::event::UserBlockCompleted;
-use crate::terminal::input::{CompleterData, IntelligentAutosuggestionResult};
-use crate::terminal::model::session::Sessions;
-use crate::terminal::{History, HistoryEntry, TerminalModel};
-use crate::workspaces::user_workspaces::UserWorkspaces;
+use std::collections::HashMap;
+use std::sync::Arc;
+#[cfg(feature = "local_fs")]
+use std::time::Duration;
+
 use chrono::Utc;
 use futures::stream::AbortHandle;
 use galaxy_completer::completer::{
@@ -25,15 +19,29 @@ use galaxyui::{AppContext, Entity, ModelContext, ModelHandle, SingletonEntity};
 use itertools::Itertools;
 #[cfg_attr(not(feature = "local_fs"), allow(unused_imports))]
 use parking_lot::{FairMutex, Mutex};
-use std::collections::HashMap;
-use std::sync::Arc;
+use galaxy_completer::completer::{
+    self, expand_command_aliases, AliasExpansionResult, CompleterOptions,
+    CompletionsFallbackStrategy, MatchStrategy,
+};
 #[cfg(feature = "local_fs")]
-use std::time::Duration;
 
 use super::generate_ai_input_suggestions::{
     create_generate_ai_input_suggestions_request, get_context_messages,
     GenerateAIInputSuggestionsRequest, GenerateAIInputSuggestionsResponseV2, NextCommandContext,
 };
+use crate::ai::block_context::BlockContext;
+use crate::ai_assistant::execution_context::WarpAiExecutionContext;
+use crate::completer::SessionContext;
+#[cfg(feature = "local_fs")]
+use crate::persistence::{database_file_path_for_scope, establish_ro_connection, PersistenceScope};
+use crate::report_error;
+use crate::server::server_api::{AIApiError, ServerApi};
+use crate::settings::AISettings;
+use crate::terminal::event::UserBlockCompleted;
+use crate::terminal::input::{CompleterData, IntelligentAutosuggestionResult};
+use crate::terminal::model::session::Sessions;
+use crate::terminal::{History, HistoryEntry, TerminalModel};
+use crate::workspaces::user_workspaces::UserWorkspaces;
 
 cfg_if::cfg_if! {
     if #[cfg(feature = "local_fs")] {
@@ -156,10 +164,10 @@ impl NextCommandModel {
         server_api: Arc<ServerApi>,
     ) -> Self {
         #[cfg(feature = "local_fs")]
-        let conn = crate::persistence::database_file_path()
+        let conn = database_file_path_for_scope(&PersistenceScope::App)
             .to_str()
             .and_then(|db_url| {
-                crate::persistence::establish_ro_connection(db_url)
+                establish_ro_connection(db_url)
                     .ok()
                     .map(|conn| Arc::new(Mutex::new(conn)))
             });
@@ -828,5 +836,5 @@ fn find_potential_autosuggestions_from_history<'a>(
 }
 
 #[cfg(test)]
-#[path = "next_command_model_test.rs"]
+#[path = "next_command_model_tests.rs"]
 mod tests;

app/src/ai/predict/next_command_model_tests.rs

@@ -1,14 +1,13 @@
-use crate::completer::SessionContext;
-use crate::terminal::model::session::Session;
-use crate::terminal::model::session::{
-    command_executor::testing::TestCommandExecutor, SessionInfo,
-};
-use galaxy_completer::signatures::CommandRegistry;
-use galaxy_completer::{meta::SpannedItem, parsers::ParsedToken};
-use galaxyui::App;
 use typed_path::TypedPathBuf;
+use galaxy_completer::meta::SpannedItem;
+use galaxy_completer::parsers::ParsedToken;
+use galaxy_completer::signatures::CommandRegistry;
+use galaxyui::App;
 
 use super::*;
+use crate::completer::SessionContext;
+use crate::terminal::model::session::command_executor::testing::TestCommandExecutor;
+use crate::terminal::model::session::{Session, SessionInfo};
 
 #[test]
 fn test_find_autosuggestion_from_history_same_directory() {

app/src/ai/predict/prompt_suggestions/mod.rs

@@ -1,8 +1,10 @@
 use std::sync::LazyLock;
 
-use galaxyui::{keymap::Keystroke, AppContext};
+use galaxyui::keymap::Keystroke;
+use galaxyui::AppContext;
 
-use crate::{terminal::TerminalModel, util::bindings::keybinding_name_to_keystroke};
+use crate::terminal::TerminalModel;
+use crate::util::bindings::keybinding_name_to_keystroke;
 
 pub const ACCEPT_PROMPT_SUGGESTION_KEYBINDING: &str = "terminal:accept_prompt_suggestions";