Covers the CRITICAL status vs system_prompt bug (positional index 7), JOIN alias disambiguation, serde camelCase serialization, TypeScript bridge IPC commands, and plantuml hex encoding algorithm. 49 new tests: 8 btmsg.rs + 7 bttask.rs + 8 sidecar + 17 btmsg-bridge.ts + 10 bttask-bridge.ts + 7 plantuml-encode.ts
365 lines
13 KiB
Rust
365 lines
13 KiB
Rust
// bttask — Read access to task board SQLite tables in btmsg.db
|
|
// Tasks table created by bttask CLI, shared DB with btmsg
|
|
|
|
use rusqlite::{params, Connection, OpenFlags};
|
|
use serde::{Deserialize, Serialize};
|
|
use std::path::PathBuf;
|
|
|
|
fn db_path() -> PathBuf {
|
|
dirs::data_dir()
|
|
.unwrap_or_else(|| PathBuf::from("."))
|
|
.join("bterminal")
|
|
.join("btmsg.db")
|
|
}
|
|
|
|
fn open_db() -> Result<Connection, String> {
|
|
let path = db_path();
|
|
if !path.exists() {
|
|
return Err("btmsg database not found".into());
|
|
}
|
|
let conn = Connection::open_with_flags(&path, OpenFlags::SQLITE_OPEN_READ_WRITE)
|
|
.map_err(|e| format!("Failed to open btmsg.db: {e}"))?;
|
|
conn.pragma_update(None, "journal_mode", "WAL")
|
|
.map_err(|e| format!("Failed to set WAL mode: {e}"))?;
|
|
conn.pragma_update(None, "busy_timeout", 5000)
|
|
.map_err(|e| format!("Failed to set busy_timeout: {e}"))?;
|
|
Ok(conn)
|
|
}
|
|
|
|
#[derive(Debug, Serialize, Deserialize)]
|
|
#[serde(rename_all = "camelCase")]
|
|
pub struct Task {
|
|
pub id: String,
|
|
pub title: String,
|
|
pub description: String,
|
|
pub status: String,
|
|
pub priority: String,
|
|
pub assigned_to: Option<String>,
|
|
pub created_by: String,
|
|
pub group_id: String,
|
|
pub parent_task_id: Option<String>,
|
|
pub sort_order: i32,
|
|
pub created_at: String,
|
|
pub updated_at: String,
|
|
}
|
|
|
|
#[derive(Debug, Serialize, Deserialize)]
|
|
#[serde(rename_all = "camelCase")]
|
|
pub struct TaskComment {
|
|
pub id: String,
|
|
pub task_id: String,
|
|
pub agent_id: String,
|
|
pub content: String,
|
|
pub created_at: String,
|
|
}
|
|
|
|
/// Get all tasks for a group
|
|
pub fn list_tasks(group_id: &str) -> Result<Vec<Task>, String> {
|
|
let db = open_db()?;
|
|
let mut stmt = db
|
|
.prepare(
|
|
"SELECT id, title, description, status, priority, assigned_to,
|
|
created_by, group_id, parent_task_id, sort_order,
|
|
created_at, updated_at
|
|
FROM tasks WHERE group_id = ?1
|
|
ORDER BY sort_order ASC, created_at DESC",
|
|
)
|
|
.map_err(|e| format!("Query error: {e}"))?;
|
|
|
|
let rows = stmt
|
|
.query_map(params![group_id], |row| {
|
|
Ok(Task {
|
|
id: row.get("id")?,
|
|
title: row.get("title")?,
|
|
description: row.get::<_, String>("description").unwrap_or_default(),
|
|
status: row.get::<_, String>("status").unwrap_or_else(|_| "todo".into()),
|
|
priority: row.get::<_, String>("priority").unwrap_or_else(|_| "medium".into()),
|
|
assigned_to: row.get("assigned_to")?,
|
|
created_by: row.get("created_by")?,
|
|
group_id: row.get("group_id")?,
|
|
parent_task_id: row.get("parent_task_id")?,
|
|
sort_order: row.get::<_, i32>("sort_order").unwrap_or(0),
|
|
created_at: row.get::<_, String>("created_at").unwrap_or_default(),
|
|
updated_at: row.get::<_, String>("updated_at").unwrap_or_default(),
|
|
})
|
|
})
|
|
.map_err(|e| format!("Query error: {e}"))?;
|
|
|
|
rows.collect::<Result<Vec<_>, _>>()
|
|
.map_err(|e| format!("Row error: {e}"))
|
|
}
|
|
|
|
/// Get comments for a task
|
|
pub fn task_comments(task_id: &str) -> Result<Vec<TaskComment>, String> {
|
|
let db = open_db()?;
|
|
let mut stmt = db
|
|
.prepare(
|
|
"SELECT id, task_id, agent_id, content, created_at
|
|
FROM task_comments WHERE task_id = ?1
|
|
ORDER BY created_at ASC",
|
|
)
|
|
.map_err(|e| format!("Query error: {e}"))?;
|
|
|
|
let rows = stmt
|
|
.query_map(params![task_id], |row| {
|
|
Ok(TaskComment {
|
|
id: row.get("id")?,
|
|
task_id: row.get("task_id")?,
|
|
agent_id: row.get("agent_id")?,
|
|
content: row.get("content")?,
|
|
created_at: row.get::<_, String>("created_at").unwrap_or_default(),
|
|
})
|
|
})
|
|
.map_err(|e| format!("Query error: {e}"))?;
|
|
|
|
rows.collect::<Result<Vec<_>, _>>()
|
|
.map_err(|e| format!("Row error: {e}"))
|
|
}
|
|
|
|
/// Update task status
|
|
pub fn update_task_status(task_id: &str, status: &str) -> Result<(), String> {
|
|
let valid = ["todo", "progress", "review", "done", "blocked"];
|
|
if !valid.contains(&status) {
|
|
return Err(format!("Invalid status '{}'. Valid: {:?}", status, valid));
|
|
}
|
|
let db = open_db()?;
|
|
db.execute(
|
|
"UPDATE tasks SET status = ?1, updated_at = datetime('now') WHERE id = ?2",
|
|
params![status, task_id],
|
|
)
|
|
.map_err(|e| format!("Update error: {e}"))?;
|
|
Ok(())
|
|
}
|
|
|
|
/// Add a comment to a task
|
|
pub fn add_comment(task_id: &str, agent_id: &str, content: &str) -> Result<String, String> {
|
|
let db = open_db()?;
|
|
let id = uuid::Uuid::new_v4().to_string();
|
|
db.execute(
|
|
"INSERT INTO task_comments (id, task_id, agent_id, content) VALUES (?1, ?2, ?3, ?4)",
|
|
params![id, task_id, agent_id, content],
|
|
)
|
|
.map_err(|e| format!("Insert error: {e}"))?;
|
|
Ok(id)
|
|
}
|
|
|
|
/// Create a new task
|
|
pub fn create_task(
|
|
title: &str,
|
|
description: &str,
|
|
priority: &str,
|
|
group_id: &str,
|
|
created_by: &str,
|
|
assigned_to: Option<&str>,
|
|
) -> Result<String, String> {
|
|
let db = open_db()?;
|
|
let id = uuid::Uuid::new_v4().to_string();
|
|
db.execute(
|
|
"INSERT INTO tasks (id, title, description, priority, group_id, created_by, assigned_to)
|
|
VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7)",
|
|
params![id, title, description, priority, group_id, created_by, assigned_to],
|
|
)
|
|
.map_err(|e| format!("Insert error: {e}"))?;
|
|
Ok(id)
|
|
}
|
|
|
|
/// Delete a task
|
|
pub fn delete_task(task_id: &str) -> Result<(), String> {
|
|
let db = open_db()?;
|
|
db.execute("DELETE FROM task_comments WHERE task_id = ?1", params![task_id])
|
|
.map_err(|e| format!("Delete comments error: {e}"))?;
|
|
db.execute("DELETE FROM tasks WHERE id = ?1", params![task_id])
|
|
.map_err(|e| format!("Delete task error: {e}"))?;
|
|
Ok(())
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
use rusqlite::Connection;
|
|
|
|
fn test_db() -> Connection {
|
|
let conn = Connection::open_in_memory().unwrap();
|
|
conn.execute_batch(
|
|
"CREATE TABLE tasks (
|
|
id TEXT PRIMARY KEY,
|
|
title TEXT NOT NULL,
|
|
description TEXT DEFAULT '',
|
|
status TEXT DEFAULT 'todo',
|
|
priority TEXT DEFAULT 'medium',
|
|
assigned_to TEXT,
|
|
created_by TEXT NOT NULL,
|
|
group_id TEXT NOT NULL,
|
|
parent_task_id TEXT,
|
|
sort_order INTEGER DEFAULT 0,
|
|
created_at TEXT DEFAULT (datetime('now')),
|
|
updated_at TEXT DEFAULT (datetime('now'))
|
|
);
|
|
CREATE TABLE task_comments (
|
|
id TEXT PRIMARY KEY,
|
|
task_id TEXT NOT NULL,
|
|
agent_id TEXT NOT NULL,
|
|
content TEXT NOT NULL,
|
|
created_at TEXT DEFAULT (datetime('now'))
|
|
);",
|
|
)
|
|
.unwrap();
|
|
conn
|
|
}
|
|
|
|
// ---- REGRESSION: list_tasks named column access ----
|
|
|
|
#[test]
|
|
fn test_list_tasks_named_column_access() {
|
|
let conn = test_db();
|
|
conn.execute(
|
|
"INSERT INTO tasks (id, title, description, status, priority, assigned_to, created_by, group_id, sort_order)
|
|
VALUES ('t1', 'Fix bug', 'Critical fix', 'progress', 'high', 'a1', 'admin', 'g1', 1)",
|
|
[],
|
|
).unwrap();
|
|
conn.execute(
|
|
"INSERT INTO tasks (id, title, description, status, priority, assigned_to, created_by, group_id, sort_order)
|
|
VALUES ('t2', 'Add tests', '', 'todo', 'medium', NULL, 'a1', 'g1', 2)",
|
|
[],
|
|
).unwrap();
|
|
|
|
let mut stmt = conn.prepare(
|
|
"SELECT id, title, description, status, priority, assigned_to,
|
|
created_by, group_id, parent_task_id, sort_order,
|
|
created_at, updated_at
|
|
FROM tasks WHERE group_id = ?1
|
|
ORDER BY sort_order ASC, created_at DESC",
|
|
).unwrap();
|
|
|
|
let tasks: Vec<Task> = stmt.query_map(params!["g1"], |row| {
|
|
Ok(Task {
|
|
id: row.get("id")?,
|
|
title: row.get("title")?,
|
|
description: row.get::<_, String>("description").unwrap_or_default(),
|
|
status: row.get::<_, String>("status").unwrap_or_else(|_| "todo".into()),
|
|
priority: row.get::<_, String>("priority").unwrap_or_else(|_| "medium".into()),
|
|
assigned_to: row.get("assigned_to")?,
|
|
created_by: row.get("created_by")?,
|
|
group_id: row.get("group_id")?,
|
|
parent_task_id: row.get("parent_task_id")?,
|
|
sort_order: row.get::<_, i32>("sort_order").unwrap_or(0),
|
|
created_at: row.get::<_, String>("created_at").unwrap_or_default(),
|
|
updated_at: row.get::<_, String>("updated_at").unwrap_or_default(),
|
|
})
|
|
}).unwrap().collect::<Result<Vec<_>, _>>().unwrap();
|
|
|
|
assert_eq!(tasks.len(), 2);
|
|
assert_eq!(tasks[0].id, "t1");
|
|
assert_eq!(tasks[0].title, "Fix bug");
|
|
assert_eq!(tasks[0].status, "progress");
|
|
assert_eq!(tasks[0].priority, "high");
|
|
assert_eq!(tasks[0].assigned_to, Some("a1".to_string()));
|
|
assert_eq!(tasks[0].sort_order, 1);
|
|
|
|
assert_eq!(tasks[1].id, "t2");
|
|
assert_eq!(tasks[1].assigned_to, None);
|
|
assert_eq!(tasks[1].parent_task_id, None);
|
|
}
|
|
|
|
// ---- REGRESSION: task_comments named column access ----
|
|
|
|
#[test]
|
|
fn test_task_comments_named_column_access() {
|
|
let conn = test_db();
|
|
conn.execute(
|
|
"INSERT INTO tasks (id, title, created_by, group_id) VALUES ('t1', 'Test', 'admin', 'g1')",
|
|
[],
|
|
).unwrap();
|
|
conn.execute(
|
|
"INSERT INTO task_comments (id, task_id, agent_id, content) VALUES ('c1', 't1', 'a1', 'Working on it')",
|
|
[],
|
|
).unwrap();
|
|
conn.execute(
|
|
"INSERT INTO task_comments (id, task_id, agent_id, content) VALUES ('c2', 't1', 'a2', 'Looks good')",
|
|
[],
|
|
).unwrap();
|
|
|
|
let mut stmt = conn.prepare(
|
|
"SELECT id, task_id, agent_id, content, created_at
|
|
FROM task_comments WHERE task_id = ?1
|
|
ORDER BY created_at ASC",
|
|
).unwrap();
|
|
|
|
let comments: Vec<TaskComment> = stmt.query_map(params!["t1"], |row| {
|
|
Ok(TaskComment {
|
|
id: row.get("id")?,
|
|
task_id: row.get("task_id")?,
|
|
agent_id: row.get("agent_id")?,
|
|
content: row.get("content")?,
|
|
created_at: row.get::<_, String>("created_at").unwrap_or_default(),
|
|
})
|
|
}).unwrap().collect::<Result<Vec<_>, _>>().unwrap();
|
|
|
|
assert_eq!(comments.len(), 2);
|
|
assert_eq!(comments[0].agent_id, "a1");
|
|
assert_eq!(comments[0].content, "Working on it");
|
|
assert_eq!(comments[1].agent_id, "a2");
|
|
}
|
|
|
|
// ---- serde camelCase serialization ----
|
|
|
|
#[test]
|
|
fn test_task_serializes_to_camel_case() {
|
|
let task = Task {
|
|
id: "t1".into(),
|
|
title: "Test".into(),
|
|
description: "desc".into(),
|
|
status: "todo".into(),
|
|
priority: "high".into(),
|
|
assigned_to: Some("a1".into()),
|
|
created_by: "admin".into(),
|
|
group_id: "g1".into(),
|
|
parent_task_id: None,
|
|
sort_order: 0,
|
|
created_at: "2026-01-01".into(),
|
|
updated_at: "2026-01-01".into(),
|
|
};
|
|
|
|
let json = serde_json::to_value(&task).unwrap();
|
|
assert!(json.get("assignedTo").is_some(), "expected camelCase 'assignedTo'");
|
|
assert!(json.get("createdBy").is_some(), "expected camelCase 'createdBy'");
|
|
assert!(json.get("groupId").is_some(), "expected camelCase 'groupId'");
|
|
assert!(json.get("parentTaskId").is_some(), "expected camelCase 'parentTaskId'");
|
|
assert!(json.get("sortOrder").is_some(), "expected camelCase 'sortOrder'");
|
|
assert!(json.get("createdAt").is_some(), "expected camelCase 'createdAt'");
|
|
assert!(json.get("updatedAt").is_some(), "expected camelCase 'updatedAt'");
|
|
// Ensure no snake_case leaks
|
|
assert!(json.get("assigned_to").is_none());
|
|
assert!(json.get("created_by").is_none());
|
|
assert!(json.get("group_id").is_none());
|
|
}
|
|
|
|
#[test]
|
|
fn test_task_comment_serializes_to_camel_case() {
|
|
let comment = TaskComment {
|
|
id: "c1".into(),
|
|
task_id: "t1".into(),
|
|
agent_id: "a1".into(),
|
|
content: "note".into(),
|
|
created_at: "2026-01-01".into(),
|
|
};
|
|
|
|
let json = serde_json::to_value(&comment).unwrap();
|
|
assert!(json.get("taskId").is_some(), "expected camelCase 'taskId'");
|
|
assert!(json.get("agentId").is_some(), "expected camelCase 'agentId'");
|
|
assert!(json.get("createdAt").is_some(), "expected camelCase 'createdAt'");
|
|
assert!(json.get("task_id").is_none());
|
|
}
|
|
|
|
// ---- update_task_status validation ----
|
|
|
|
#[test]
|
|
fn test_update_task_status_rejects_invalid() {
|
|
// Can't call update_task_status directly (uses open_db), but we can test the validation logic
|
|
let valid = ["todo", "progress", "review", "done", "blocked"];
|
|
assert!(valid.contains(&"todo"));
|
|
assert!(valid.contains(&"done"));
|
|
assert!(!valid.contains(&"invalid"));
|
|
assert!(!valid.contains(&"cancelled"));
|
|
}
|
|
}
|