diff --git a/crates/atuin-client/src/database.rs b/crates/atuin-client/src/database.rs index 7c63368..338e107 100644 --- a/crates/atuin-client/src/database.rs +++ b/crates/atuin-client/src/database.rs @@ -367,6 +367,16 @@ impl Database for Sqlite { } &mut query } + FilterMode::SessionHost => { + query.and_where_eq("session", quote(&context.session)); + if let Some(session_start) = session_start { + query.or_where(format!( + "hostname = {} and timestamp < {session_start}", + quote(&context.hostname) + )); + } + &mut query + } FilterMode::Directory => query.and_where_eq("cwd", quote(&context.cwd)), FilterMode::Workspace => query.and_where_like_left("cwd", &git_root), }; @@ -498,6 +508,16 @@ impl Database for Sqlite { } &mut sql } + FilterMode::SessionHost => { + sql.and_where_eq("session", quote(&context.session)); + if let Some(session_start) = session_start { + sql.or_where(format!( + "lower(hostname) = {} and timestamp < {session_start}", + quote(context.hostname.to_lowercase()) + )); + } + &mut sql + } FilterMode::Directory => sql.and_where_eq("cwd", quote(&context.cwd)), FilterMode::Workspace => sql.and_where_like_left("cwd", git_root), }; diff --git a/crates/atuin-client/src/settings.rs b/crates/atuin-client/src/settings.rs index 745bd2f..4580db3 100644 --- a/crates/atuin-client/src/settings.rs +++ b/crates/atuin-client/src/settings.rs @@ -114,6 +114,9 @@ pub enum FilterMode { #[serde(rename = "session-preload")] SessionPreload = 5, + + #[serde(rename = "session-host")] + SessionHost = 6, } impl FilterMode { @@ -125,6 +128,7 @@ impl FilterMode { FilterMode::Directory => "DIRECTORY", FilterMode::Workspace => "WORKSPACE", FilterMode::SessionPreload => "SESSION+", + FilterMode::SessionHost => "SESSION*", } } } @@ -774,6 +778,7 @@ impl Default for Search { FilterMode::Host, FilterMode::Session, FilterMode::SessionPreload, + FilterMode::SessionHost, FilterMode::Workspace, FilterMode::Directory, ], @@ -1461,6 +1466,7 @@ impl Settings { "workspace", "directory", "session-preload", + "session-host", ], )? .set_default("theme.name", "default")? diff --git a/crates/atuin-daemon/src/client.rs b/crates/atuin-daemon/src/client.rs index 2f492f6..2fbb5d0 100644 --- a/crates/atuin-daemon/src/client.rs +++ b/crates/atuin-daemon/src/client.rs @@ -229,6 +229,7 @@ impl From for RpcFilterMode { FilterMode::Directory => RpcFilterMode::Directory, FilterMode::Workspace => RpcFilterMode::Workspace, FilterMode::SessionPreload => RpcFilterMode::SessionPreload, + FilterMode::SessionHost => RpcFilterMode::Session, } } } diff --git a/crates/atuin/src/command/client/search/engines/skim.rs b/crates/atuin/src/command/client/search/engines/skim.rs index 7d9feb4..01a2c15 100644 --- a/crates/atuin/src/command/client/search/engines/skim.rs +++ b/crates/atuin/src/command/client/search/engines/skim.rs @@ -131,6 +131,51 @@ async fn fuzzy_search( } } } + // SessionHost: include current session + host history from before session start + FilterMode::SessionHost => { + let is_current_session = { + history + .session + .as_bytes() + .chunks(32) + .any(|chunk| chunk == context.session.as_bytes()) + }; + + if !is_current_session { + let is_host_history = history + .hostname + .split(',') + .contains(&context.hostname.as_str()); + if !is_host_history { + continue; + } + + let Ok(uuid) = uuid::Uuid::parse_str(&context.session) else { + log::warn!("failed to parse session id '{}'", context.session); + continue; + }; + let Some(timestamp) = uuid.get_timestamp() else { + log::warn!( + "failed to get timestamp from uuid '{}'", + uuid.as_hyphenated() + ); + continue; + }; + let (seconds, nanos) = timestamp.to_unix(); + let Ok(session_start) = time::OffsetDateTime::from_unix_timestamp_nanos( + i128::from(seconds) * 1_000_000_000 + i128::from(nanos), + ) else { + log::warn!( + "failed to create OffsetDateTime from second: {seconds}, nanosecond: {nanos}" + ); + continue; + }; + + if history.timestamp >= session_start { + continue; + } + } + } // we aggregate directory by ':' separating them FilterMode::Directory if history.cwd.split(':').contains(&context.cwd.as_str()) => {} FilterMode::Workspace if history.cwd.split(':').contains(&git_root) => {}