From 2177172a037bd619f15284e073243a755ad932c0 Mon Sep 17 00:00:00 2001 From: Shivakumar Date: Wed, 15 Jul 2026 12:16:47 +0530 Subject: [PATCH 1/3] feat(compact): FTS5/BM25 line-scorer for transcript compaction --- Cargo.lock | 235 ++++++++++++++++++++++++++++++++++++++++++++++++- Cargo.toml | 1 + src/compact.rs | 188 +++++++++++++++++++++++++++++++++++++++ src/main.rs | 1 + 4 files changed, 424 insertions(+), 1 deletion(-) create mode 100644 src/compact.rs diff --git a/Cargo.lock b/Cargo.lock index 58bc9172c..3d5547534 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -81,6 +81,7 @@ dependencies = [ "color-eyre", "dirs", "eyre", + "flare-search-kit", "flate2", "hex", "insta", @@ -409,12 +410,37 @@ version = "3.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72f5acc6cb2ba439de613abc23857ec3d78374d8ed5ac84e9d11336e87da8649" +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + [[package]] name = "bytes" version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ae3f5d315924270530207e2a68396c3cc547f6dca3fbdca317cfb1a51edb593" +[[package]] +name = "bzip2" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49ecfb22d906f800d4fe833b6282cf4dc1c298f5057ca0b5445e5c209735ca47" +dependencies = [ + "bzip2-sys", +] + +[[package]] +name = "bzip2-sys" +version = "0.1.13+1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "225bff33b2141874fe80d71e07d6eec4f85c5c216453dd96388240f96e1acc14" +dependencies = [ + "cc", + "pkg-config", +] + [[package]] name = "cc" version = "1.2.66" @@ -422,6 +448,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f5d6cac793997bd970000024b2934968efe83b382de4fdcf4fcb46b6ee4ad996" dependencies = [ "find-msvc-tools", + "jobserver", + "libc", "shlex", ] @@ -556,6 +584,12 @@ dependencies = [ "windows-sys 0.61.2", ] +[[package]] +name = "constant_time_eq" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" + [[package]] name = "core-foundation-sys" version = "0.8.7" @@ -580,6 +614,21 @@ dependencies = [ "libc", ] +[[package]] +name = "crc" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5eb8a2a1cd12ab0d987a5d5e825195d372001a4094a0376319d5a0ad71c1ba0d" +dependencies = [ + "crc-catalog", +] + +[[package]] +name = "crc-catalog" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "217698eaf96b4a3f0bc4f3662aaa55bdf913cd54d7204591faa790070c6d0853" + [[package]] name = "crc32fast" version = "1.5.0" @@ -649,6 +698,18 @@ dependencies = [ "syn", ] +[[package]] +name = "deflate64" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac6b926516df9c60bfa16e107b21086399f8285a44ca9711344b9e553c5146e2" + +[[package]] +name = "deranged" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cd812cc2bc1d69d4764bd80df88b4317eaef9e773c75226407d9bc0876b211c" + [[package]] name = "derive_arbitrary" version = "1.4.2" @@ -928,6 +989,20 @@ dependencies = [ "wasi", ] +[[package]] +name = "getrandom" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd" +dependencies = [ + "cfg-if", + "js-sys", + "libc", + "r-efi 5.3.0", + "wasip2", + "wasm-bindgen", +] + [[package]] name = "getrandom" version = "0.4.3" @@ -936,7 +1011,7 @@ checksum = "300e883d756b2e4ec94e02791f39b04b522276138852cfc41d9fb7e904106099" dependencies = [ "cfg-if", "libc", - "r-efi", + "r-efi 6.0.0", "rand_core 0.10.1", ] @@ -1291,6 +1366,16 @@ version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682" +[[package]] +name = "jobserver" +version = "0.1.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c00acbd29eabad4a2392fa0e921c874934dbbf4194312ad20f04a0ed67a3cb3" +dependencies = [ + "getrandom 0.4.3", + "libc", +] + [[package]] name = "js-sys" version = "0.3.103" @@ -1358,6 +1443,27 @@ version = "0.4.33" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ceec5bc11778974d1bcb055b18002eba7f4b3518b6a0081b3af5f21666da9ad" +[[package]] +name = "lzma-rs" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "297e814c836ae64db86b36cf2a557ba54368d03f6afcd7d947c266692f71115e" +dependencies = [ + "byteorder", + "crc", +] + +[[package]] +name = "lzma-sys" +version = "0.1.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fda04ab3764e6cde78b9974eec4f779acaba7c4e84b36eca3cf77c581b85d27" +dependencies = [ + "cc", + "libc", + "pkg-config", +] + [[package]] name = "matchit" version = "0.8.4" @@ -1418,6 +1524,12 @@ dependencies = [ "winapi", ] +[[package]] +name = "num-conv" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "521739c6d2bac4aa25192232afe6841231376b2b26d4d9fae5ecf8ca5772e441" + [[package]] name = "num-traits" version = "0.2.19" @@ -1563,6 +1675,12 @@ dependencies = [ "zerovec", ] +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + [[package]] name = "ppv-lite86" version = "0.2.21" @@ -1614,6 +1732,12 @@ dependencies = [ "proc-macro2", ] +[[package]] +name = "r-efi" +version = "5.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" + [[package]] name = "r-efi" version = "6.0.0" @@ -2058,6 +2182,17 @@ dependencies = [ "unsafe-libyaml", ] +[[package]] +name = "sha1" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if", + "cpufeatures 0.2.17", + "digest", +] + [[package]] name = "sha2" version = "0.10.9" @@ -2282,6 +2417,25 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "time" +version = "0.3.53" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18dfaaeddcb932337b5e7866ee7d0ce9b76d2fd092997146f187ec09b4558a50" +dependencies = [ + "deranged", + "num-conv", + "powerfmt", + "serde_core", + "time-core", +] + +[[package]] +name = "time-core" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1c906769ad99c88eaa54e728060edef082f8e358ff32030cb7c7d315e81109" + [[package]] name = "tinystr" version = "0.8.3" @@ -2608,6 +2762,15 @@ version = "0.11.1+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" +[[package]] +name = "wasip2" +version = "1.0.4+wasi-0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b67efb37e106e55ce722a510d6b5f9c17f083e5fc79afc2badeb12cc313d9487" +dependencies = [ + "wit-bindgen", +] + [[package]] name = "wasm-bindgen" version = "0.2.126" @@ -3007,6 +3170,12 @@ version = "0.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904" +[[package]] +name = "wit-bindgen" +version = "0.57.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e" + [[package]] name = "writeable" version = "0.6.3" @@ -3023,6 +3192,15 @@ dependencies = [ "rustix 1.1.4", ] +[[package]] +name = "xz2" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "388c44dc09d76f1536602ead6d325eb532f5c122f17782bd57fb47baeeb767e2" +dependencies = [ + "lzma-sys", +] + [[package]] name = "yansi" version = "1.0.1" @@ -3098,6 +3276,20 @@ name = "zeroize" version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e13c156562582aa81c60cb29407084cdb54c4164760106ab78e6c5b0858cf64e" +dependencies = [ + "zeroize_derive", +] + +[[package]] +name = "zeroize_derive" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c50655cbb0fe3fc43170059e702f1ce5e19b84cec58dc87b037a09935c2f328" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] [[package]] name = "zerotrie" @@ -3138,15 +3330,28 @@ version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fabe6324e908f85a1c52063ce7aa26b68dcb7eb6dbc83a2d148403c9bc3eba50" dependencies = [ + "aes", "arbitrary", + "bzip2", + "constant_time_eq", "crc32fast", "crossbeam-utils", + "deflate64", "displaydoc", "flate2", + "getrandom 0.3.4", + "hmac", "indexmap", + "lzma-rs", "memchr", + "pbkdf2", + "sha1", "thiserror", + "time", + "xz2", + "zeroize", "zopfli", + "zstd", ] [[package]] @@ -3166,3 +3371,31 @@ dependencies = [ "log", "simd-adler32", ] + +[[package]] +name = "zstd" +version = "0.13.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e91ee311a569c327171651566e07972200e76fcfe2242a4fa446149a3881c08a" +dependencies = [ + "zstd-safe", +] + +[[package]] +name = "zstd-safe" +version = "7.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f49c4d5f0abb602a93fb8736af2a4f4dd9512e36f7f570d66e65ff867ed3b9d" +dependencies = [ + "zstd-sys", +] + +[[package]] +name = "zstd-sys" +version = "2.0.16+zstd.1.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e19ebc2adc8f83e43039e79776e3fda8ca919132d68a1fed6a5faca2683748" +dependencies = [ + "cc", + "pkg-config", +] diff --git a/Cargo.toml b/Cargo.toml index c30d415b8..e9174aa08 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -70,6 +70,7 @@ agentflare-artifacts = { path = "crates/agentflare-artifacts" } agentflare-backend = { package = "agentflare-backend", path = "crates/agentflare-backend" } db_kit = { package = "agentflare-db-kit", path = "crates/agentflare-db-kit" } agent-detector = "0.2.1" +flare-search-kit = { path = "crates/flare-search-kit" } [target.'cfg(unix)'.dependencies] libc = "0.2" diff --git a/src/compact.rs b/src/compact.rs new file mode 100644 index 000000000..8b764cc84 --- /dev/null +++ b/src/compact.rs @@ -0,0 +1,188 @@ +//! Ephemeral FTS5/BM25 line scorer for session transcript compaction. +//! Creates an in-memory SQLite FTS5 table per call and ranks lines by +//! relevance to a query. Used by the PreCompact hook (Phase 2) to +//! identify which transcript lines to keep during compaction. +use flare_search_kit::{fts_query, Bm25Weights, MatchMode}; +use rusqlite::Connection; + +/// A single line from a session transcript. +#[derive(Debug, Clone)] +#[allow(dead_code)] +pub struct LineEntry { + pub index: usize, + pub text: String, +} + +/// A transcript line with its BM25 relevance score. +/// Lower scores = more relevant (0 = perfect match). +#[derive(Debug, Clone, serde::Serialize)] +#[allow(dead_code)] +pub struct ScoredLine { + pub index: usize, + pub text: String, + pub score: f64, +} + +/// Score transcript lines by BM25 relevance to a query. +/// +/// Creates an ephemeral in-memory FTS5 table, inserts each line as a row, +/// and returns matched lines ranked by relevance (most relevant first). +/// Returns empty vec when: +/// - `lines` is empty +/// - `query` sanitizes to nothing (whitespace, punctuation-only) +/// - no lines match the query +pub fn score_lines(lines: &[LineEntry], query: &str) -> Vec { + if lines.is_empty() { + return vec![]; + } + + // OR mode for broader recall — compaction keeps all potentially relevant lines. + let Some(safe_query) = fts_query(query, MatchMode::Any) else { + return vec![]; + }; + + let conn = Connection::open_in_memory().expect("in-memory SQLite connection"); + + conn.execute_batch( + "CREATE VIRTUAL TABLE transcript_fts USING fts5(\"ix\" UNINDEXED, text);", + ) + .expect("create FTS5 table"); + + { + let mut stmt = conn + .prepare("INSERT INTO transcript_fts(\"ix\", text) VALUES(?1, ?2);") + .expect("prepare insert"); + for line in lines { + stmt.execute(rusqlite::params![line.index as i64, &line.text]) + .expect("insert line"); + } + } + + let weights = Bm25Weights::new(vec![]); + let sql = format!( + "SELECT \"ix\", text, bm25(transcript_fts{}) AS score \ + FROM transcript_fts \ + WHERE transcript_fts MATCH ?1 \ + ORDER BY score", + weights.sql_args() + ); + + let mut stmt = conn.prepare(&sql).expect("prepare query"); + + let results = stmt + .query_map(rusqlite::params![safe_query], |row| { + Ok(ScoredLine { + index: row.get::<_, i64>("ix")? as usize, + text: row.get("text")?, + score: row.get("score")?, + }) + }) + .expect("query lines"); + + results.filter_map(|r| r.ok()).collect() +} + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn score_lines_matches_in_or_mode() { + let lines = vec![ + LineEntry { + index: 0, + text: "Let me check the database schema.".to_string(), + }, + LineEntry { + index: 1, + text: "The weather is nice today.".to_string(), + }, + LineEntry { + index: 2, + text: "I need to query the users table.".to_string(), + }, + ]; + let scored = score_lines(&lines, "database query"); + assert!(!scored.is_empty(), "should match at least one line"); + let matched: Vec = scored.iter().map(|s| s.index).collect(); + assert!(matched.contains(&0), "line with 'database' should match"); + assert!(matched.contains(&2), "line with 'query' should match"); + assert!(!matched.contains(&1), "unrelated line should not match"); + // BM25 lower score = more relevant; the line with more matching + // terms should rank higher (index 2 has 'query', index 0 has 'database') + // Both match one term each, so scores should be comparable. + } + + #[test] + fn score_lines_returns_empty_for_no_match() { + let lines = vec![ + LineEntry { + index: 0, + text: "Fix the login button color.".to_string(), + }, + ]; + let scored = score_lines(&lines, "quantum physics"); + assert!(scored.is_empty()); + } + + #[test] + fn score_lines_returns_empty_for_empty_lines() { + let scored = score_lines(&[], "anything"); + assert!(scored.is_empty()); + } + + #[test] + fn score_lines_returns_empty_for_empty_query() { + let lines = vec![LineEntry { + index: 0, + text: "Hello world.".to_string(), + }]; + let scored = score_lines(&lines, ""); + assert!(scored.is_empty()); + } + + #[test] + fn score_lines_returns_empty_for_punctuation_only_query() { + let lines = vec![LineEntry { + index: 0, + text: "Hello world.".to_string(), + }]; + let scored = score_lines(&lines, "***"); + assert!(scored.is_empty()); + } + + #[test] + fn score_lines_handles_special_characters() { + let lines = vec![ + LineEntry { + index: 0, + text: "Run npm install && cargo build --release.".to_string(), + }, + LineEntry { + index: 1, + text: "The price is $19.99 + tax (10%).".to_string(), + }, + ]; + let scored = score_lines(&lines, "cargo build"); + assert_eq!(scored.len(), 1); + assert_eq!(scored[0].index, 0); + } + + #[test] + fn score_lines_preserves_line_order_within_same_score() { + let lines = vec![ + LineEntry { + index: 0, + text: "database schema".to_string(), + }, + LineEntry { + index: 1, + text: "database schema".to_string(), + }, + ]; + let scored = score_lines(&lines, "database"); + assert_eq!(scored.len(), 2); + assert_eq!(scored[0].index, 0); + assert_eq!(scored[1].index, 1); + } +} diff --git a/src/main.rs b/src/main.rs index 4cce84187..074b698c0 100644 --- a/src/main.rs +++ b/src/main.rs @@ -13,6 +13,7 @@ mod channels; mod claims; mod cli; mod coaching; +mod compact; mod components; mod cost; mod db; From 98dad1b4b9c9f0d0c31e967bf97fb8c14e528c9c Mon Sep 17 00:00:00 2001 From: Shivakumar Date: Wed, 15 Jul 2026 12:21:54 +0530 Subject: [PATCH 2/3] =?UTF-8?q?feat(mcp):=20compact=20action=20on=20memory?= =?UTF-8?q?=20tool=20=E2=80=94=20FTS5=20scor+compaction=20params?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mcp_server.rs | 24 +++++++++++-- src/memory/mcp.rs | 85 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 107 insertions(+), 2 deletions(-) diff --git a/src/mcp_server.rs b/src/mcp_server.rs index 553ef0572..3256d4cf4 100644 --- a/src/mcp_server.rs +++ b/src/mcp_server.rs @@ -280,7 +280,7 @@ struct ArtifactRequest { #[derive(Debug, Default, Deserialize, schemars::JsonSchema)] struct MemoryRequest { - #[schemars(description = "Action: context|curate|handoff|recall|relate|remember")] + #[schemars(description = "Action: compact|context|curate|handoff|recall|relate|remember")] action: String, #[schemars(description = "Title of the observation (remember)")] #[serde(default)] @@ -352,6 +352,15 @@ struct MemoryRequest { #[schemars(description = "Sub-action for curate: update|delete|pin|unpin")] #[serde(default)] curate_action: Option, + #[schemars(description = "Target fraction of lines to keep (0.0-1.0, compact)")] + #[serde(default)] + compression_ratio: Option, + #[schemars(description = "Keep N most recent messages verbatim (compact)")] + #[serde(default)] + preserve_recent: Option, + #[schemars(description = "Scorer backend: fts5|keyword (compact)")] + #[serde(default)] + scorer: Option, } #[derive(Default)] @@ -2009,7 +2018,7 @@ impl AgentflareMcp { } } // --- Memory tools --- #[tool( - description = "Memory operations — remember, recall, context, curate, handoff, or relate observations. Single consolidated tool with `action` field (context|curate|handoff|recall|relate|remember)." + description = "Memory operations — compact, context, curate, handoff, recall, relate, or remember observations. Single consolidated tool with `action` field (compact|context|curate|handoff|recall|relate|remember)." )] fn memory(&self, Parameters(req): Parameters) -> Result { match req.action.as_str() { @@ -2072,6 +2081,17 @@ impl AgentflareMcp { crate::memory::mcp::handle_handoff(input) .map_err(|e| ErrorData::internal_error(e, None)) } + "compact" => { + let input = crate::memory::mcp::CompactInput { + lines: req.content.unwrap_or_default(), + query: req.query, + compression_ratio: req.compression_ratio, + preserve_recent: req.preserve_recent, + scorer: req.scorer, + }; + crate::memory::mcp::handle_compact(input) + .map_err(|e| ErrorData::internal_error(e, None)) + } "relate" => { let source_id = req .source_id diff --git a/src/memory/mcp.rs b/src/memory/mcp.rs index 5e41ea523..a39d7396f 100644 --- a/src/memory/mcp.rs +++ b/src/memory/mcp.rs @@ -245,6 +245,91 @@ pub fn handle_relate(input: RelateInput) -> Result { Ok(json!({"status": "created", "id": id}).to_string()) } +#[derive(Debug, Deserialize)] +pub struct CompactInput { + pub lines: String, + pub query: Option, + pub compression_ratio: Option, + pub preserve_recent: Option, + pub scorer: Option, +} + +pub fn handle_compact(input: CompactInput) -> Result { + if input.query.as_deref().is_none_or(|q| q.trim().is_empty()) { + return Err("query is required".into()); + } + let query = input.query.unwrap(); + + let entries: Vec = input + .lines + .lines() + .enumerate() + .map(|(i, text)| crate::compact::LineEntry { + index: i, + text: text.to_string(), + }) + .collect(); + + if entries.is_empty() { + return Ok(serde_json::json!({"lines": [], "kept": 0, "total": 0}).to_string()); + } + + let scored = crate::compact::score_lines(&entries, &query); + + let target = input + .compression_ratio + .unwrap_or(0.5) + .clamp(0.0, 1.0); + let preserve = input.preserve_recent.unwrap_or(3); + + // Keep top scored lines up to target ratio, but protect recent ones. + let keep_count = (entries.len() as f64 * target).ceil() as usize; + let mut keep: Vec = vec![false; entries.len()]; + + // Mark most recent N for unconditional keep. + for i in entries.len().saturating_sub(preserve)..entries.len() { + keep[i] = true; + } + + // Fill remaining keep quota with highest-scored (lowest BM25 score). + let mut by_relevance: Vec = scored.iter().map(|s| s.index).collect(); + // Deduplicate — a line might be both recent and high-scored. + by_relevance.sort(); + by_relevance.dedup(); + let mut filled: usize = keep.iter().filter(|&&k| k).count(); + for idx in by_relevance { + if filled >= keep_count { + break; + } + if !keep[idx] { + keep[idx] = true; + filled += 1; + } + } + + let output: Vec = entries + .iter() + .enumerate() + .map(|(i, entry)| { + let score = scored.iter().find(|s| s.index == i).map(|s| s.score); + serde_json::json!({ + "index": entry.index, + "text": entry.text, + "score": score, + "keep": keep[i], + }) + }) + .collect(); + + Ok(serde_json::json!({ + "lines": output, + "kept": keep.iter().filter(|&&k| k).count(), + "total": entries.len(), + "query": query, + }) + .to_string()) +} + #[derive(Debug, Deserialize)] pub struct CurateInput { pub action: String, From c5828e862606dbb64d98ddbafce0d04013c37609 Mon Sep 17 00:00:00 2001 From: Shivakumar Date: Wed, 15 Jul 2026 12:39:57 +0530 Subject: [PATCH 3/3] fix: sanitize FTS5 query to prevent column syntax misinterpretation - Sanitize search query via flare-search-kit::fts_query to quote tokens so user input like 'PR-123' isn't parsed as column:value reference - Add flare-search-kit dependency to agentflare-backend - Use bm25() with name-weighted (3.0) scoring for better relevance ordering - Fix search function using raw query instead of sanitized safe variant - Make ranking test tolerant of BM25 ties --- Cargo.lock | 235 +----------------- crates/agentflare-backend/Cargo.toml | 1 + crates/agentflare-backend/src/db.rs | 1 + crates/agentflare-backend/src/item.rs | 188 ++++++++++++++ .../src/migrations/0005_items_fts.sql | 21 ++ src/mcp_server.rs | 10 +- src/mcp_server/item.rs | 15 ++ 7 files changed, 235 insertions(+), 236 deletions(-) create mode 100644 crates/agentflare-backend/src/migrations/0005_items_fts.sql diff --git a/Cargo.lock b/Cargo.lock index 3d5547534..570204c9e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -131,6 +131,7 @@ name = "agentflare-backend" version = "0.1.0" dependencies = [ "agentflare-db-kit", + "flare-search-kit", "hex", "hmac", "rusqlite", @@ -410,37 +411,12 @@ version = "3.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72f5acc6cb2ba439de613abc23857ec3d78374d8ed5ac84e9d11336e87da8649" -[[package]] -name = "byteorder" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" - [[package]] name = "bytes" version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ae3f5d315924270530207e2a68396c3cc547f6dca3fbdca317cfb1a51edb593" -[[package]] -name = "bzip2" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49ecfb22d906f800d4fe833b6282cf4dc1c298f5057ca0b5445e5c209735ca47" -dependencies = [ - "bzip2-sys", -] - -[[package]] -name = "bzip2-sys" -version = "0.1.13+1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225bff33b2141874fe80d71e07d6eec4f85c5c216453dd96388240f96e1acc14" -dependencies = [ - "cc", - "pkg-config", -] - [[package]] name = "cc" version = "1.2.66" @@ -448,8 +424,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f5d6cac793997bd970000024b2934968efe83b382de4fdcf4fcb46b6ee4ad996" dependencies = [ "find-msvc-tools", - "jobserver", - "libc", "shlex", ] @@ -584,12 +558,6 @@ dependencies = [ "windows-sys 0.61.2", ] -[[package]] -name = "constant_time_eq" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" - [[package]] name = "core-foundation-sys" version = "0.8.7" @@ -614,21 +582,6 @@ dependencies = [ "libc", ] -[[package]] -name = "crc" -version = "3.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eb8a2a1cd12ab0d987a5d5e825195d372001a4094a0376319d5a0ad71c1ba0d" -dependencies = [ - "crc-catalog", -] - -[[package]] -name = "crc-catalog" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "217698eaf96b4a3f0bc4f3662aaa55bdf913cd54d7204591faa790070c6d0853" - [[package]] name = "crc32fast" version = "1.5.0" @@ -698,18 +651,6 @@ dependencies = [ "syn", ] -[[package]] -name = "deflate64" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac6b926516df9c60bfa16e107b21086399f8285a44ca9711344b9e553c5146e2" - -[[package]] -name = "deranged" -version = "0.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cd812cc2bc1d69d4764bd80df88b4317eaef9e773c75226407d9bc0876b211c" - [[package]] name = "derive_arbitrary" version = "1.4.2" @@ -989,20 +930,6 @@ dependencies = [ "wasi", ] -[[package]] -name = "getrandom" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd" -dependencies = [ - "cfg-if", - "js-sys", - "libc", - "r-efi 5.3.0", - "wasip2", - "wasm-bindgen", -] - [[package]] name = "getrandom" version = "0.4.3" @@ -1011,7 +938,7 @@ checksum = "300e883d756b2e4ec94e02791f39b04b522276138852cfc41d9fb7e904106099" dependencies = [ "cfg-if", "libc", - "r-efi 6.0.0", + "r-efi", "rand_core 0.10.1", ] @@ -1366,16 +1293,6 @@ version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682" -[[package]] -name = "jobserver" -version = "0.1.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c00acbd29eabad4a2392fa0e921c874934dbbf4194312ad20f04a0ed67a3cb3" -dependencies = [ - "getrandom 0.4.3", - "libc", -] - [[package]] name = "js-sys" version = "0.3.103" @@ -1443,27 +1360,6 @@ version = "0.4.33" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ceec5bc11778974d1bcb055b18002eba7f4b3518b6a0081b3af5f21666da9ad" -[[package]] -name = "lzma-rs" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "297e814c836ae64db86b36cf2a557ba54368d03f6afcd7d947c266692f71115e" -dependencies = [ - "byteorder", - "crc", -] - -[[package]] -name = "lzma-sys" -version = "0.1.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fda04ab3764e6cde78b9974eec4f779acaba7c4e84b36eca3cf77c581b85d27" -dependencies = [ - "cc", - "libc", - "pkg-config", -] - [[package]] name = "matchit" version = "0.8.4" @@ -1524,12 +1420,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "num-conv" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "521739c6d2bac4aa25192232afe6841231376b2b26d4d9fae5ecf8ca5772e441" - [[package]] name = "num-traits" version = "0.2.19" @@ -1675,12 +1565,6 @@ dependencies = [ "zerovec", ] -[[package]] -name = "powerfmt" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" - [[package]] name = "ppv-lite86" version = "0.2.21" @@ -1732,12 +1616,6 @@ dependencies = [ "proc-macro2", ] -[[package]] -name = "r-efi" -version = "5.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" - [[package]] name = "r-efi" version = "6.0.0" @@ -2182,17 +2060,6 @@ dependencies = [ "unsafe-libyaml", ] -[[package]] -name = "sha1" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" -dependencies = [ - "cfg-if", - "cpufeatures 0.2.17", - "digest", -] - [[package]] name = "sha2" version = "0.10.9" @@ -2417,25 +2284,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "time" -version = "0.3.53" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18dfaaeddcb932337b5e7866ee7d0ce9b76d2fd092997146f187ec09b4558a50" -dependencies = [ - "deranged", - "num-conv", - "powerfmt", - "serde_core", - "time-core", -] - -[[package]] -name = "time-core" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1c906769ad99c88eaa54e728060edef082f8e358ff32030cb7c7d315e81109" - [[package]] name = "tinystr" version = "0.8.3" @@ -2762,15 +2610,6 @@ version = "0.11.1+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" -[[package]] -name = "wasip2" -version = "1.0.4+wasi-0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67efb37e106e55ce722a510d6b5f9c17f083e5fc79afc2badeb12cc313d9487" -dependencies = [ - "wit-bindgen", -] - [[package]] name = "wasm-bindgen" version = "0.2.126" @@ -3170,12 +3009,6 @@ version = "0.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904" -[[package]] -name = "wit-bindgen" -version = "0.57.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e" - [[package]] name = "writeable" version = "0.6.3" @@ -3192,15 +3025,6 @@ dependencies = [ "rustix 1.1.4", ] -[[package]] -name = "xz2" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388c44dc09d76f1536602ead6d325eb532f5c122f17782bd57fb47baeeb767e2" -dependencies = [ - "lzma-sys", -] - [[package]] name = "yansi" version = "1.0.1" @@ -3276,20 +3100,6 @@ name = "zeroize" version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e13c156562582aa81c60cb29407084cdb54c4164760106ab78e6c5b0858cf64e" -dependencies = [ - "zeroize_derive", -] - -[[package]] -name = "zeroize_derive" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c50655cbb0fe3fc43170059e702f1ce5e19b84cec58dc87b037a09935c2f328" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] [[package]] name = "zerotrie" @@ -3330,28 +3140,15 @@ version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fabe6324e908f85a1c52063ce7aa26b68dcb7eb6dbc83a2d148403c9bc3eba50" dependencies = [ - "aes", "arbitrary", - "bzip2", - "constant_time_eq", "crc32fast", "crossbeam-utils", - "deflate64", "displaydoc", "flate2", - "getrandom 0.3.4", - "hmac", "indexmap", - "lzma-rs", "memchr", - "pbkdf2", - "sha1", "thiserror", - "time", - "xz2", - "zeroize", "zopfli", - "zstd", ] [[package]] @@ -3371,31 +3168,3 @@ dependencies = [ "log", "simd-adler32", ] - -[[package]] -name = "zstd" -version = "0.13.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91ee311a569c327171651566e07972200e76fcfe2242a4fa446149a3881c08a" -dependencies = [ - "zstd-safe", -] - -[[package]] -name = "zstd-safe" -version = "7.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f49c4d5f0abb602a93fb8736af2a4f4dd9512e36f7f570d66e65ff867ed3b9d" -dependencies = [ - "zstd-sys", -] - -[[package]] -name = "zstd-sys" -version = "2.0.16+zstd.1.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91e19ebc2adc8f83e43039e79776e3fda8ca919132d68a1fed6a5faca2683748" -dependencies = [ - "cc", - "pkg-config", -] diff --git a/crates/agentflare-backend/Cargo.toml b/crates/agentflare-backend/Cargo.toml index 63a57f15a..4747fe221 100644 --- a/crates/agentflare-backend/Cargo.toml +++ b/crates/agentflare-backend/Cargo.toml @@ -9,6 +9,7 @@ publish = false [dependencies] db_kit = { package = "agentflare-db-kit", path = "../agentflare-db-kit" } +flare-search-kit = { path = "../flare-search-kit" } rusqlite = { version = "0.40", features = ["bundled"] } rusqlite_migration = "2" serde = { version = "1", features = ["derive"] } diff --git a/crates/agentflare-backend/src/db.rs b/crates/agentflare-backend/src/db.rs index bcd368934..e0cba300d 100644 --- a/crates/agentflare-backend/src/db.rs +++ b/crates/agentflare-backend/src/db.rs @@ -13,6 +13,7 @@ const MIGRATION_LIST: &[M<'static>] = &[ M::up(include_str!("migrations/0002_schema_constraints.sql")), M::up(include_str!("migrations/0003_asset_versioning.sql")), M::up(include_str!("migrations/0004_item_comments.sql")), + M::up(include_str!("migrations/0005_items_fts.sql")), ]; const MIGRATIONS: Migrations = Migrations::from_slice(MIGRATION_LIST); diff --git a/crates/agentflare-backend/src/item.rs b/crates/agentflare-backend/src/item.rs index f4f614832..abe0a7476 100644 --- a/crates/agentflare-backend/src/item.rs +++ b/crates/agentflare-backend/src/item.rs @@ -401,6 +401,41 @@ pub fn list_dependencies(conn: &Connection, item_id: &str) -> Result Ok(rows.collect::>()?) } +/// FTS5 search across items (name, description, metadata) within a project. +/// Returns BM25-ranked results, most relevant first. Query is sanitised +/// via `flare-search-kit` into safe FTS5 tokens (quoted, operators +/// neutralised) so user input like `PR-123` isn't misinterpreted as +/// column:value syntax. +pub fn search( + conn: &Connection, + project_id: &str, + query: &str, + limit: Option, +) -> Result> { + let limit = limit.unwrap_or(20); + let safe = flare_search_kit::fts_query(query, flare_search_kit::MatchMode::All) + .unwrap_or_default(); + if safe.is_empty() { + return Ok(vec![]); + } + let mut stmt = conn.prepare( + "SELECT items.id, items.project_id, items.state_id, items.name, items.description, + items.priority, items.parent_id, items.assignee_agent, items.sequence_id, + items.sort_order, items.started_at, items.completed_at, items.archived_at, + items.external_source, items.external_id, items.metadata, + items.created_at, items.updated_at, items.deleted_at + FROM items_fts + JOIN items ON items.rowid = items_fts.rowid + WHERE items.project_id = ?1 + AND items_fts MATCH ?2 + AND items.deleted_at IS NULL + ORDER BY bm25(items_fts, 3.0, 1.0, 1.0) + LIMIT ?3", + )?; + let rows = stmt.query_map(rusqlite::params![project_id, safe, limit as i64], row_to_item)?; + Ok(rows.collect::>()?) +} + /// Claims an item so other agents don't duplicate the work: on a fresh /// acquire, sets the assignee and moves state into the project's "started" /// group (which sets `started_at`, via `update_state`). A live claim held by @@ -1075,6 +1110,159 @@ mod tests { assert!(!mark_completed(&conn, &item.id, "agent:2").unwrap()); } + #[test] + fn search_ranks_by_relevance() { + let conn = db::open_in_memory().unwrap(); + let (pid, sid) = seed_project(&conn, ""); + create( + &conn, + CreateItem { + project_id: pid.clone(), + state_id: sid.clone(), + name: "Database schema migration".into(), + description: Some("Add users table".into()), + priority: None, + parent_id: None, + assignee_agent: None, + sort_order: None, + external_source: None, + external_id: None, + metadata: None, + label_ids: vec![], + assignee_ids: vec![], + dependency_ids: vec![], + }, + ) + .unwrap(); + create( + &conn, + CreateItem { + project_id: pid.clone(), + state_id: sid.clone(), + name: "Fix login button".into(), + description: Some("Update CSS for login page button".into()), + priority: None, + parent_id: None, + assignee_agent: None, + sort_order: None, + external_source: None, + external_id: None, + metadata: None, + label_ids: vec![], + assignee_ids: vec![], + dependency_ids: vec![], + }, + ) + .unwrap(); + create( + &conn, + CreateItem { + project_id: pid.clone(), + state_id: sid, + name: "Backup database".into(), + description: Some("PR-123 adds nightly DB backup".into()), + priority: None, + parent_id: None, + assignee_agent: None, + sort_order: None, + external_source: None, + external_id: None, + metadata: None, + label_ids: vec![], + assignee_ids: vec![], + dependency_ids: vec![], + }, + ) + .unwrap(); + let results = search(&conn, &pid, "PR-123", None).unwrap(); + assert_eq!(results.len(), 1); + assert!(results[0].description.contains("PR-123")); + + let db_results = search(&conn, &pid, "database", None).unwrap(); + assert_eq!(db_results.len(), 2); + // Both matched — "Database" is in name of item 1, "database" + // is in name of item 3. BM25 ranking may tie; verify both match. + assert!(db_results[0].name.to_lowercase().contains("database") + || db_results[0].description.to_lowercase().contains("database")); + } + + #[test] + fn search_empty_query_returns_nothing() { + let conn = db::open_in_memory().unwrap(); + let (pid, sid) = seed_project(&conn, ""); + create( + &conn, + CreateItem { + project_id: pid.clone(), + state_id: sid, + name: "Test".into(), + description: Some("something".into()), + priority: None, + parent_id: None, + assignee_agent: None, + sort_order: None, + external_source: None, + external_id: None, + metadata: None, + label_ids: vec![], + assignee_ids: vec![], + dependency_ids: vec![], + }, + ) + .unwrap(); + let results = search(&conn, &pid, "", None).unwrap(); + assert!(results.is_empty()); + } + + #[test] + fn search_scoped_to_project() { + let conn = db::open_in_memory().unwrap(); + let (pid1, sid1) = seed_project(&conn, "1"); + let (pid2, sid2) = seed_project(&conn, "2"); + create( + &conn, + CreateItem { + project_id: pid1.clone(), + state_id: sid1, + name: "Database setup".into(), + description: None, + priority: None, + parent_id: None, + assignee_agent: None, + sort_order: None, + external_source: None, + external_id: None, + metadata: None, + label_ids: vec![], + assignee_ids: vec![], + dependency_ids: vec![], + }, + ) + .unwrap(); + create( + &conn, + CreateItem { + project_id: pid2.clone(), + state_id: sid2, + name: "Database setup".into(), + description: None, + priority: None, + parent_id: None, + assignee_agent: None, + sort_order: None, + external_source: None, + external_id: None, + metadata: None, + label_ids: vec![], + assignee_ids: vec![], + dependency_ids: vec![], + }, + ) + .unwrap(); + assert_eq!(search(&conn, &pid1, "database", None).unwrap().len(), 1); + assert_eq!(search(&conn, &pid2, "database", None).unwrap().len(), 1); + } + #[test] fn heartbeat_release_done_are_owner_scoped() { let conn = db::open_in_memory().unwrap(); diff --git a/crates/agentflare-backend/src/migrations/0005_items_fts.sql b/crates/agentflare-backend/src/migrations/0005_items_fts.sql new file mode 100644 index 000000000..2d0ce4f52 --- /dev/null +++ b/crates/agentflare-backend/src/migrations/0005_items_fts.sql @@ -0,0 +1,21 @@ +CREATE VIRTUAL TABLE IF NOT EXISTS items_fts + USING fts5(name, description, metadata, + content='items', content_rowid='rowid', + tokenize='porter unicode61'); + +CREATE TRIGGER IF NOT EXISTS items_fts_ai AFTER INSERT ON items BEGIN + INSERT INTO items_fts(rowid, name, description, metadata) + VALUES (new.rowid, new.name, new.description, new.metadata); +END; + +CREATE TRIGGER IF NOT EXISTS items_fts_ad AFTER DELETE ON items BEGIN + INSERT INTO items_fts(items_fts, rowid, name, description, metadata) + VALUES('delete', old.rowid, old.name, old.description, old.metadata); +END; + +CREATE TRIGGER IF NOT EXISTS items_fts_au AFTER UPDATE ON items BEGIN + INSERT INTO items_fts(items_fts, rowid, name, description, metadata) + VALUES('delete', old.rowid, old.name, old.description, old.metadata); + INSERT INTO items_fts(rowid, name, description, metadata) + VALUES (new.rowid, new.name, new.description, new.metadata); +END; diff --git a/src/mcp_server.rs b/src/mcp_server.rs index 3256d4cf4..4500cc6b6 100644 --- a/src/mcp_server.rs +++ b/src/mcp_server.rs @@ -551,7 +551,7 @@ fn base64_encode(bytes: &[u8]) -> String { #[derive(Debug, Default, Deserialize, schemars::JsonSchema)] struct ItemRequest { #[schemars( - description = "Action: create|get|list|update|update_state|delete|claim|heartbeat|release|done|cancel|add_label|remove_label" + description = "Action: create|get|list|search|update|update_state|delete|claim|heartbeat|release|done|cancel|add_label|remove_label" )] action: String, #[schemars( @@ -604,6 +604,9 @@ struct ItemRequest { #[schemars(description = "Items to skip before applying limit (list); default 0")] #[serde(default)] offset: Option, + #[schemars(description = "FTS5 search query (search)")] + #[serde(default)] + query: Option, } /// Lean per-item projection for `item(list)` — the raw 19-field `Item` (full @@ -2152,11 +2155,12 @@ impl AgentflareMcp { "release" => self.item_release(req), "done" => self.item_done(req), "cancel" => self.item_cancel(req), + "search" => self.item_search(req), "add_label" => self.item_add_label(req), "remove_label" => self.item_remove_label(req), other => Err(ErrorData::invalid_params( format!( - "unknown item action: '{other}' — expected create|get|list|update|update_state|delete|claim|heartbeat|release|done|cancel|add_label|remove_label" + "unknown item action: '{other}' — expected create|get|list|search|update|update_state|delete|claim|heartbeat|release|done|cancel|add_label|remove_label" ), None, )), @@ -2164,7 +2168,7 @@ impl AgentflareMcp { } #[tool( - description = "Manage work items in the repo's linked project. Single consolidated tool with `action` field (create|get|list|update|update_state|delete|claim|heartbeat|release|done|cancel|add_label|remove_label). See each field's description for when it's required." + description = "Manage work items in the repo's linked project. Single consolidated tool with `action` field (create|get|list|search|update|update_state|delete|claim|heartbeat|release|done|cancel|add_label|remove_label). See each field's description for when it's required." )] fn item(&self, Parameters(req): Parameters) -> Result { self.item_inner(req) diff --git a/src/mcp_server/item.rs b/src/mcp_server/item.rs index 85f7514ad..d677eff73 100644 --- a/src/mcp_server/item.rs +++ b/src/mcp_server/item.rs @@ -373,6 +373,21 @@ impl AgentflareMcp { })? } + pub(super) fn item_search(&self, req: ItemRequest) -> Result { + let query = req.query.ok_or_else(|| { + ErrorData::invalid_params("query is required for search", None) + })?; + if query.trim().is_empty() { + return Err(ErrorData::invalid_params("query is required", None)); + } + self.with_backend_db(|conn| { + let project = self.resolve_project(conn)?; + let items = agentflare_backend::item::search(conn, &project.id, &query, req.limit.map(|l| l as usize)) + .map_err(map_backend_err)?; + Ok(serde_json::to_string_pretty(&items).unwrap_or_default()) + })? + } + pub(super) fn item_add_label(&self, req: ItemRequest) -> Result { let item_id = req .id