Skip to content

Solution for long term memory for agent coding CLIs and to facilitate handoff between different agent vendors

Rust

fix(web): group the search scope selector by workspace name

Peterson Salme44a75a165f6c
diff --git a/crates/ai-memory-web/src/routes/search.rs b/crates/ai-memory-web/src/routes/search.rs
index ce581ed6..4a3bde48 100644
--- a/crates/ai-memory-web/src/routes/search.rs
+++ b/crates/ai-memory-web/src/routes/search.rs
@@ -12,6 +12,7 @@
//! viewer may read, as `memory_query(global=true)` does. Its trace is the
//! FTS time alone; there are no per-hit streams to show.
+use std::collections::BTreeMap;
use std::sync::Arc;
use ai_memory_store::{SearchExplain, StreamTimings};
@@ -209,21 +210,30 @@ pub(crate) async fn handler(
Ok(summaries) => summaries,
Err(error) => return internal(error),
};
- let mut scope_groups: Vec<ScopeGroup> = Vec::new();
+ // The reader returns projects newest first, which interleaves
+ // workspaces; group and order by name instead.
+ let mut by_workspace: BTreeMap<String, Vec<ScopeOption>> = BTreeMap::new();
for s in summaries {
let option = ScopeOption {
value: format!("{}/{}", s.workspace_name, s.project_name),
selected: s.workspace_name == workspace && s.project_name == project,
label: s.project_name,
};
- match scope_groups.last_mut() {
- Some(group) if group.workspace == s.workspace_name => group.projects.push(option),
- _ => scope_groups.push(ScopeGroup {
- workspace: s.workspace_name,
- projects: vec![option],
- }),
- }
+ by_workspace
+ .entry(s.workspace_name)
+ .or_default()
+ .push(option);
}
+ let scope_groups: Vec<ScopeGroup> = by_workspace
+ .into_iter()
+ .map(|(workspace, mut projects)| {
+ projects.sort_by(|a, b| a.label.cmp(&b.label));
+ ScopeGroup {
+ workspace,
+ projects,
+ }
+ })
+ .collect();
let hit_count = hits.len();
let global_href = format!("search?q={}", encode_segment(&query));
let view = SearchView {
diff --git a/crates/ai-memory-web/tests/suite/history_replay.rs b/crates/ai-memory-web/tests/suite/history_replay.rs
index 0c2808f3..f9505ac0 100644
--- a/crates/ai-memory-web/tests/suite/history_replay.rs
+++ b/crates/ai-memory-web/tests/suite/history_replay.rs
@@ -882,3 +882,26 @@ async fn session_timeline_renders_captured_markup_inert() {
assert!(!html.contains("\"><img"), "{html}");
assert!(html.contains("&lt;script&gt;alert("), "{html}");
}
+
+/// The session timeline's header search stays inside the session's project.
+#[tokio::test]
+async fn session_timeline_header_search_carries_the_project() {
+ let f = Fixture::new().await;
+ let scope = f.scope("default", "app").await;
+ let session = f.session(scope, None, &[("step", "body")]).await;
+ let (status, html) = get(&f.web(), &format!("/w/default/app/s/{session}")).await;
+ assert_eq!(status, StatusCode::OK, "{html}");
+ let header = html.split("<main").next().unwrap();
+ assert!(
+ header.contains(r#"<input type="hidden" name="workspace" value="default">"#),
+ "{header}"
+ );
+ assert!(
+ header.contains(r#"<input type="hidden" name="project" value="app">"#),
+ "{header}"
+ );
+ assert!(
+ header.contains(r#"placeholder="Search default/app…""#),
+ "{header}"
+ );
+}
diff --git a/crates/ai-memory-web/tests/suite/routes.rs b/crates/ai-memory-web/tests/suite/routes.rs
index 7974c4a4..53101079 100644
--- a/crates/ai-memory-web/tests/suite/routes.rs
+++ b/crates/ai-memory-web/tests/suite/routes.rs
@@ -4821,6 +4821,49 @@ async fn header_search_carries_the_current_project() {
}
}
+/// Projects come back newest first; the selector still shows one group per
+/// workspace, in name order, even when recency interleaves the workspaces.
+#[tokio::test]
+async fn search_page_scope_selector_groups_each_workspace_once() {
+ let (_tmp, store, wiki) = setup().await;
+ for (workspace, project) in [("aaa", "one"), ("zzz", "two"), ("aaa", "three")] {
+ let ws = store
+ .writer
+ .get_or_create_workspace(workspace)
+ .await
+ .unwrap();
+ let proj = store
+ .writer
+ .get_or_create_project(ws, project, None)
+ .await
+ .unwrap();
+ wiki.write_page(wiki_req(ws, proj, "notes/a.md", "# A\n\nbody"))
+ .await
+ .unwrap();
+ }
+ let app = router(store.reader.clone(), wiki.clone());
+
+ let (status, text) = get_text(&app, "/search?q=body", None).await;
+ assert_eq!(status, StatusCode::OK);
+ assert_eq!(
+ text.matches(r#"<optgroup label="aaa">"#).count(),
+ 1,
+ "{text}"
+ );
+ assert_eq!(
+ text.matches(r#"<optgroup label="zzz">"#).count(),
+ 1,
+ "{text}"
+ );
+ let pos = |needle: &str| {
+ text.find(needle)
+ .unwrap_or_else(|| panic!("{needle}: {text}"))
+ };
+ assert!(pos(r#"label="aaa""#) < pos(r#"label="zzz""#));
+ assert!(pos(r#"value="aaa/one""#) < pos(r#"value="aaa/three""#));
+ assert!(pos(r#"value="aaa/three""#) < pos(r#"label="zzz""#));
+}
+
#[tokio::test]
async fn search_page_scope_selector_round_trips_and_rejects_malformed_values() {
let (_tmp, store, wiki) = setup().await;