diff --git a/Cargo.lock b/Cargo.lock index 6451c71cb..d7efe090a 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", 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..e349ddb06 100644 --- a/crates/agentflare-backend/src/item.rs +++ b/crates/agentflare-backend/src/item.rs @@ -401,6 +401,44 @@ 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, flare_search_kit::clamped_limit(limit)], + 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 +1113,164 @@ 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..79c0c60c3 --- /dev/null +++ b/crates/agentflare-backend/src/migrations/0005_items_fts.sql @@ -0,0 +1,28 @@ +CREATE VIRTUAL TABLE IF NOT EXISTS items_fts + USING fts5(name, description, metadata, + content='items', content_rowid='rowid', + tokenize='porter unicode61'); + +-- Backfill items that existed before this migration -- the triggers below +-- only keep the index in sync with FUTURE inserts/updates, so without +-- this, every item created before items_fts existed would be permanently +-- invisible to search() until it happened to be touched again. +INSERT INTO items_fts(rowid, name, description, metadata) + SELECT rowid, name, description, metadata FROM items; + +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 40d89df90..f42c71f4f 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( @@ -598,12 +598,17 @@ struct ItemRequest { )] #[serde(default)] state_group: Option, - #[schemars(description = "Max items to return (list); omit for no limit")] + #[schemars( + description = "Max items to return (list: omit for no limit; search: omit for 20, capped at 1000)" + )] #[serde(default)] limit: Option, #[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 @@ -2179,11 +2184,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, )), @@ -2191,7 +2197,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..ef281b9a1 100644 --- a/src/mcp_server/item.rs +++ b/src/mcp_server/item.rs @@ -373,6 +373,26 @@ 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