mirror of
https://github.com/outbackdingo/optimclaw.git
synced 2026-08-26 15:40:18 +00:00
Replace unsafe `&s[..n]` patterns with `floor_char_boundary(s, n)` at 3 production code sites where the truncation index could land mid-multibyte character, panicking on non-ASCII input: - src/llm/nearai_chat.rs: API response truncation in error message - src/cli/memory.rs: memory content display truncation - src/cli/config.rs: config value display truncation All 3 sites operate on external or user-supplied strings that may contain non-ASCII characters. The existing `crate::util::floor_char_boundary` utility (used at 18 other call sites) walks back to the nearest char boundary, preventing the panic. Adds regression test with multi-byte characters (combining accents and 4-byte emoji) for truncate_content. [skip-regression-check] Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>
312 lines
8.9 KiB
Rust
312 lines
8.9 KiB
Rust
//! Memory/workspace CLI commands.
|
|
//!
|
|
//! Exposes the workspace system for direct CLI use without starting the agent.
|
|
|
|
use std::io::Read;
|
|
use std::sync::Arc;
|
|
|
|
use clap::Subcommand;
|
|
|
|
use crate::workspace::{EmbeddingCacheConfig, EmbeddingProvider, SearchConfig, Workspace};
|
|
|
|
/// Run a memory command using the Database trait (works with any backend).
|
|
pub async fn run_memory_command_with_db(
|
|
cmd: MemoryCommand,
|
|
db: std::sync::Arc<dyn crate::db::Database>,
|
|
embeddings: Option<Arc<dyn EmbeddingProvider>>,
|
|
cache_config: EmbeddingCacheConfig,
|
|
) -> anyhow::Result<()> {
|
|
let mut workspace = Workspace::new_with_db("default", db);
|
|
if let Some(emb) = embeddings {
|
|
workspace = workspace.with_embeddings_cached(emb, cache_config);
|
|
}
|
|
|
|
match cmd {
|
|
MemoryCommand::Search { query, limit } => search(&workspace, &query, limit).await,
|
|
MemoryCommand::Read { path } => read(&workspace, &path).await,
|
|
MemoryCommand::Write {
|
|
path,
|
|
content,
|
|
append,
|
|
} => write(&workspace, &path, content, append).await,
|
|
MemoryCommand::Tree { path, depth } => tree(&workspace, &path, depth).await,
|
|
MemoryCommand::Status => status(&workspace).await,
|
|
}
|
|
}
|
|
|
|
#[derive(Subcommand, Debug, Clone)]
|
|
pub enum MemoryCommand {
|
|
/// Search workspace memory (hybrid full-text + semantic)
|
|
Search {
|
|
/// Search query
|
|
query: String,
|
|
|
|
/// Maximum number of results
|
|
#[arg(short, long, default_value = "5")]
|
|
limit: usize,
|
|
},
|
|
|
|
/// Read a file from the workspace
|
|
Read {
|
|
/// File path (e.g., "MEMORY.md", "daily/2024-01-15.md")
|
|
path: String,
|
|
},
|
|
|
|
/// Write content to a workspace file
|
|
Write {
|
|
/// File path (e.g., "notes/idea.md")
|
|
path: String,
|
|
|
|
/// Content to write (omit to read from stdin)
|
|
content: Option<String>,
|
|
|
|
/// Append instead of overwrite
|
|
#[arg(short, long)]
|
|
append: bool,
|
|
},
|
|
|
|
/// Show workspace directory tree
|
|
Tree {
|
|
/// Root path to start from
|
|
#[arg(default_value = "")]
|
|
path: String,
|
|
|
|
/// Maximum depth to traverse
|
|
#[arg(short, long, default_value = "3")]
|
|
depth: usize,
|
|
},
|
|
|
|
/// Show workspace status (document count, index health)
|
|
Status,
|
|
}
|
|
|
|
/// Run a memory command (PostgreSQL backend).
|
|
#[cfg(feature = "postgres")]
|
|
pub async fn run_memory_command(
|
|
cmd: MemoryCommand,
|
|
pool: deadpool_postgres::Pool,
|
|
embeddings: Option<Arc<dyn EmbeddingProvider>>,
|
|
cache_config: EmbeddingCacheConfig,
|
|
) -> anyhow::Result<()> {
|
|
let mut workspace = Workspace::new("default", pool);
|
|
if let Some(emb) = embeddings {
|
|
workspace = workspace.with_embeddings_cached(emb, cache_config);
|
|
}
|
|
|
|
match cmd {
|
|
MemoryCommand::Search { query, limit } => search(&workspace, &query, limit).await,
|
|
MemoryCommand::Read { path } => read(&workspace, &path).await,
|
|
MemoryCommand::Write {
|
|
path,
|
|
content,
|
|
append,
|
|
} => write(&workspace, &path, content, append).await,
|
|
MemoryCommand::Tree { path, depth } => tree(&workspace, &path, depth).await,
|
|
MemoryCommand::Status => status(&workspace).await,
|
|
}
|
|
}
|
|
|
|
async fn search(workspace: &Workspace, query: &str, limit: usize) -> anyhow::Result<()> {
|
|
let config = SearchConfig::default().with_limit(limit.min(50));
|
|
let results = workspace.search_with_config(query, config).await?;
|
|
|
|
if results.is_empty() {
|
|
println!("No results found for: {}", query);
|
|
return Ok(());
|
|
}
|
|
|
|
println!("Found {} result(s) for \"{}\":\n", results.len(), query);
|
|
|
|
for (i, result) in results.iter().enumerate() {
|
|
let score_bar = score_indicator(result.score);
|
|
println!("{}. [{}] (score: {:.3})", i + 1, score_bar, result.score);
|
|
|
|
// Show a content preview (first 200 chars)
|
|
let preview = truncate_content(&result.content, 200);
|
|
for line in preview.lines() {
|
|
println!(" {}", line);
|
|
}
|
|
println!();
|
|
}
|
|
|
|
Ok(())
|
|
}
|
|
|
|
async fn read(workspace: &Workspace, path: &str) -> anyhow::Result<()> {
|
|
match workspace.read(path).await {
|
|
Ok(doc) => {
|
|
println!("{}", doc.content);
|
|
}
|
|
Err(crate::error::WorkspaceError::DocumentNotFound { .. }) => {
|
|
anyhow::bail!("File not found: {}", path);
|
|
}
|
|
Err(e) => return Err(e.into()),
|
|
}
|
|
Ok(())
|
|
}
|
|
|
|
async fn write(
|
|
workspace: &Workspace,
|
|
path: &str,
|
|
content: Option<String>,
|
|
append: bool,
|
|
) -> anyhow::Result<()> {
|
|
let content = match content {
|
|
Some(c) => c,
|
|
None => {
|
|
// Read from stdin
|
|
let mut buf = String::new();
|
|
std::io::stdin().read_to_string(&mut buf)?;
|
|
buf
|
|
}
|
|
};
|
|
|
|
if append {
|
|
workspace.append(path, &content).await?;
|
|
println!("Appended to {}", path);
|
|
} else {
|
|
workspace.write(path, &content).await?;
|
|
println!("Wrote to {}", path);
|
|
}
|
|
|
|
Ok(())
|
|
}
|
|
|
|
async fn tree(workspace: &Workspace, path: &str, max_depth: usize) -> anyhow::Result<()> {
|
|
let root = if path.is_empty() { "." } else { path };
|
|
println!("{}/", root);
|
|
print_tree(workspace, path, "", max_depth, 0).await?;
|
|
Ok(())
|
|
}
|
|
|
|
async fn print_tree(
|
|
workspace: &Workspace,
|
|
path: &str,
|
|
prefix: &str,
|
|
max_depth: usize,
|
|
current_depth: usize,
|
|
) -> anyhow::Result<()> {
|
|
if current_depth >= max_depth {
|
|
return Ok(());
|
|
}
|
|
|
|
let entries = workspace.list(path).await?;
|
|
let count = entries.len();
|
|
|
|
for (i, entry) in entries.iter().enumerate() {
|
|
let is_last = i == count - 1;
|
|
let connector = if is_last { "└── " } else { "├── " };
|
|
let child_prefix = if is_last { " " } else { "│ " };
|
|
|
|
if entry.is_directory {
|
|
println!("{}{}{}/", prefix, connector, entry.name());
|
|
Box::pin(print_tree(
|
|
workspace,
|
|
&entry.path,
|
|
&format!("{}{}", prefix, child_prefix),
|
|
max_depth,
|
|
current_depth + 1,
|
|
))
|
|
.await?;
|
|
} else {
|
|
println!("{}{}{}", prefix, connector, entry.name());
|
|
}
|
|
}
|
|
|
|
Ok(())
|
|
}
|
|
|
|
async fn status(workspace: &Workspace) -> anyhow::Result<()> {
|
|
let all_paths = workspace.list_all().await?;
|
|
let file_count = all_paths.len();
|
|
|
|
// Count directories by collecting unique parent paths
|
|
let mut dirs: std::collections::HashSet<String> = std::collections::HashSet::new();
|
|
for path in &all_paths {
|
|
if let Some(parent) = path.rsplit_once('/') {
|
|
dirs.insert(parent.0.to_string());
|
|
}
|
|
}
|
|
|
|
println!("Workspace Status");
|
|
println!(" User: {}", workspace.user_id());
|
|
println!(" Files: {}", file_count);
|
|
println!(" Directories: {}", dirs.len());
|
|
|
|
// Check key files
|
|
let key_files = [
|
|
"MEMORY.md",
|
|
"HEARTBEAT.md",
|
|
"IDENTITY.md",
|
|
"SOUL.md",
|
|
"AGENTS.md",
|
|
"USER.md",
|
|
];
|
|
println!("\n Identity files:");
|
|
for path in &key_files {
|
|
let exists = workspace.exists(path).await.unwrap_or(false);
|
|
let marker = if exists { "+" } else { "-" };
|
|
println!(" [{}] {}", marker, path);
|
|
}
|
|
|
|
Ok(())
|
|
}
|
|
|
|
fn truncate_content(s: &str, max_len: usize) -> String {
|
|
if s.len() <= max_len {
|
|
s.to_string()
|
|
} else {
|
|
let end = crate::util::floor_char_boundary(s, max_len);
|
|
format!("{}...", &s[..end])
|
|
}
|
|
}
|
|
|
|
fn score_indicator(score: f32) -> &'static str {
|
|
if score > 0.8_f32 {
|
|
"=====>"
|
|
} else if score > 0.5_f32 {
|
|
"====>"
|
|
} else if score > 0.3_f32 {
|
|
"===>"
|
|
} else if score > 0.1_f32 {
|
|
"==>"
|
|
} else {
|
|
"=>"
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn test_score_indicator() {
|
|
assert_eq!(score_indicator(0.9_f32), "=====>");
|
|
assert_eq!(score_indicator(0.6_f32), "====>");
|
|
assert_eq!(score_indicator(0.4_f32), "===>");
|
|
assert_eq!(score_indicator(0.2_f32), "==>");
|
|
assert_eq!(score_indicator(0.05_f32), "=>");
|
|
}
|
|
|
|
#[test]
|
|
fn test_truncate_content() {
|
|
assert_eq!(truncate_content("hello", 10), "hello");
|
|
assert_eq!(truncate_content("hello world", 5), "hello...");
|
|
}
|
|
|
|
#[test]
|
|
fn test_truncate_content_multibyte_does_not_panic() {
|
|
// "cafe\u{0301}" = "café" where é is e + combining accent (2 bytes for accent)
|
|
// Slicing at byte 5 would land inside the combining character
|
|
let s = "caf\u{00e9} au lait"; // café = 5 bytes (é is 2 bytes)
|
|
let result = truncate_content(s, 4); // byte 4 is inside é
|
|
assert!(result.ends_with("..."));
|
|
assert!(!result.is_empty());
|
|
|
|
// 4-byte emoji: slicing mid-emoji must not panic
|
|
let emoji = "Hi \u{1F600} there"; // 😀 is 4 bytes
|
|
let result = truncate_content(emoji, 4); // byte 4 is inside 😀
|
|
assert!(result.ends_with("..."));
|
|
}
|
|
}
|