public/galaxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Ryan Ward
2026-07-01 16:08:58 -05:00
parent 2f64909469
commit 4770ac06b5
3662 changed files with 414574 additions and 89772 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/ai/predict/next_command_model.rs
+25 -17
View File
@@ -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;