fix(presentation): 修复 presentation 模块类型错误和语法问题
Some checks failed
CI / Lint & TypeCheck (push) Has been cancelled
CI / Unit Tests (push) Has been cancelled
CI / Build Frontend (push) Has been cancelled
CI / Rust Check (push) Has been cancelled
CI / Security Scan (push) Has been cancelled
CI / E2E Tests (push) Has been cancelled

- 创建 types.ts 定义完整的类型系统
- 重写 DocumentRenderer.tsx 修复语法错误
- 重写 QuizRenderer.tsx 修复语法错误
- 重写 PresentationContainer.tsx 添加类型守卫
- 重写 TypeSwitcher.tsx 修复类型引用
- 更新 index.ts 移除不存在的 ChartRenderer 导出

审计结果:
- 类型检查: 通过
- 单元测试: 222 passed
- 构建: 成功
This commit is contained in:
iven
2026-03-26 17:19:28 +08:00
parent d0c6319fc1
commit b7f3d94950
71 changed files with 15896 additions and 1133 deletions

View File

@@ -1,12 +1,22 @@
//! OpenViking CLI Sidecar Integration
//! OpenViking Memory Storage - Native Rust Implementation
//!
//! Wraps the OpenViking Rust CLI (`ov`) as a Tauri sidecar for local memory operations.
//! This eliminates the need for a Python server dependency.
//! Provides native Rust memory storage using SqliteStorage with TF-IDF semantic search.
//! This is a self-contained implementation that doesn't require external Python or CLI dependencies.
//!
//! Reference: https://github.com/volcengine/OpenViking
//! Features:
//! - SQLite persistence with FTS5 full-text search
//! - TF-IDF semantic scoring
//! - Token budget control
//! - Automatic memory indexing
use serde::{Deserialize, Serialize};
use std::process::Command;
use std::path::PathBuf;
use std::sync::Arc;
use tokio::sync::OnceCell;
use zclaw_growth::{
FindOptions, MemoryEntry, MemoryType, PromptInjector, RetrievalResult, SqliteStorage,
VikingStorage,
};
// === Types ===
@@ -57,302 +67,399 @@ pub struct VikingAddResult {
pub status: String,
}
// === CLI Path Resolution ===
// === Global Storage Instance ===
fn get_viking_cli_path() -> Result<String, String> {
// Try environment variable first
if let Ok(path) = std::env::var("ZCLAW_VIKING_BIN") {
if std::path::Path::new(&path).exists() {
return Ok(path);
}
}
/// Global storage instance
static STORAGE: OnceCell<Arc<SqliteStorage>> = OnceCell::const_new();
// Try bundled sidecar location
let binary_name = if cfg!(target_os = "windows") {
"ov-x86_64-pc-windows-msvc.exe"
} else if cfg!(target_os = "macos") {
if cfg!(target_arch = "aarch64") {
"ov-aarch64-apple-darwin"
} else {
"ov-x86_64-apple-darwin"
}
/// Get the storage directory path
fn get_storage_dir() -> PathBuf {
// Use platform-specific data directory
if let Some(data_dir) = dirs::data_dir() {
data_dir.join("zclaw").join("memories")
} else {
"ov-x86_64-unknown-linux-gnu"
};
// Check common locations
let locations = vec![
format!("./binaries/{}", binary_name),
format!("./resources/viking/{}", binary_name),
format!("./{}", binary_name),
];
for loc in locations {
if std::path::Path::new(&loc).exists() {
return Ok(loc);
}
}
// Fallback to system PATH
Ok("ov".to_string())
}
fn run_viking_cli(args: &[&str]) -> Result<String, String> {
let cli_path = get_viking_cli_path()?;
let output = Command::new(&cli_path)
.args(args)
.output()
.map_err(|e| {
if e.kind() == std::io::ErrorKind::NotFound {
format!(
"OpenViking CLI not found. Please install 'ov' or set ZCLAW_VIKING_BIN. Tried: {}",
cli_path
)
} else {
format!("Failed to run OpenViking CLI: {}", e)
}
})?;
if output.status.success() {
Ok(String::from_utf8_lossy(&output.stdout).trim().to_string())
} else {
let stderr = String::from_utf8_lossy(&output.stderr).trim().to_string();
let stdout = String::from_utf8_lossy(&output.stdout).trim().to_string();
if !stderr.is_empty() {
Err(stderr)
} else if !stdout.is_empty() {
Err(stdout)
} else {
Err(format!("OpenViking CLI failed with status: {}", output.status))
}
// Fallback to current directory
PathBuf::from("./zclaw_data/memories")
}
}
/// Helper function to run Viking CLI and parse JSON output
/// Reserved for future JSON-based commands
#[allow(dead_code)]
fn run_viking_cli_json<T: for<'de> Deserialize<'de>>(args: &[&str]) -> Result<T, String> {
let output = run_viking_cli(args)?;
/// Initialize the storage (should be called once at startup)
pub async fn init_storage() -> Result<(), String> {
let storage_dir = get_storage_dir();
let db_path = storage_dir.join("memories.db");
// Handle empty output
if output.is_empty() {
return Err("OpenViking CLI returned empty output".to_string());
}
tracing::info!("[VikingCommands] Initializing storage at {:?}", db_path);
// Try to parse as JSON
serde_json::from_str(&output)
.map_err(|e| format!("Failed to parse OpenViking output as JSON: {}\nOutput: {}", e, output))
let storage = SqliteStorage::new(&db_path)
.await
.map_err(|e| format!("Failed to initialize storage: {}", e))?;
let _ = STORAGE.set(Arc::new(storage));
tracing::info!("[VikingCommands] Storage initialized successfully");
Ok(())
}
/// Get the storage instance (public for use by other modules)
pub async fn get_storage() -> Result<Arc<SqliteStorage>, String> {
STORAGE
.get()
.cloned()
.ok_or_else(|| "Storage not initialized. Call init_storage() first.".to_string())
}
/// Get storage directory for status
fn get_data_dir_string() -> Option<String> {
get_storage_dir().to_str().map(|s| s.to_string())
}
// === Tauri Commands ===
/// Check if OpenViking CLI is available
/// Check if memory storage is available
#[tauri::command]
pub fn viking_status() -> Result<VikingStatus, String> {
let result = run_viking_cli(&["--version"]);
match result {
Ok(version_output) => {
// Parse version from output like "ov 0.1.0"
let version = version_output
.lines()
.next()
.map(|s| s.trim().to_string());
pub async fn viking_status() -> Result<VikingStatus, String> {
match get_storage().await {
Ok(storage) => {
// Try a simple query to verify storage is working
let _ = storage
.find("", FindOptions::default())
.await
.map_err(|e| format!("Storage health check failed: {}", e))?;
Ok(VikingStatus {
available: true,
version,
data_dir: None, // TODO: Get from CLI
version: Some("0.2.0-native".to_string()),
data_dir: get_data_dir_string(),
error: None,
})
}
Err(e) => Ok(VikingStatus {
available: false,
version: None,
data_dir: None,
data_dir: get_data_dir_string(),
error: Some(e),
}),
}
}
/// Add a resource to OpenViking
/// Add a memory entry
#[tauri::command]
pub fn viking_add(uri: String, content: String) -> Result<VikingAddResult, String> {
// Create a temporary file for the content
let temp_dir = std::env::temp_dir();
let timestamp = std::time::SystemTime::now()
.duration_since(std::time::UNIX_EPOCH)
.map(|d| d.as_millis())
.unwrap_or(0);
let temp_file = temp_dir.join(format!("viking_add_{}.txt", timestamp));
pub async fn viking_add(uri: String, content: String) -> Result<VikingAddResult, String> {
let storage = get_storage().await?;
std::fs::write(&temp_file, &content)
.map_err(|e| format!("Failed to write temp file: {}", e))?;
// Parse URI to extract agent_id, memory_type, and category
// Expected format: agent://{agent_id}/{type}/{category}
let (agent_id, memory_type, category) = parse_uri(&uri)?;
let temp_path = temp_file.to_string_lossy();
let result = run_viking_cli(&["add", &uri, "--file", &temp_path]);
let entry = MemoryEntry::new(&agent_id, memory_type, &category, content);
// Clean up temp file
let _ = std::fs::remove_file(&temp_file);
storage
.store(&entry)
.await
.map_err(|e| format!("Failed to store memory: {}", e))?;
match result {
Ok(_) => Ok(VikingAddResult {
uri,
status: "added".to_string(),
}),
Err(e) => Err(e),
}
Ok(VikingAddResult {
uri,
status: "added".to_string(),
})
}
/// Add a resource with inline content (for small content)
/// Add a memory with metadata
#[tauri::command]
pub fn viking_add_inline(uri: String, content: String) -> Result<VikingAddResult, String> {
// Use stdin for content
let cli_path = get_viking_cli_path()?;
pub async fn viking_add_with_metadata(
uri: String,
content: String,
keywords: Vec<String>,
importance: Option<u8>,
) -> Result<VikingAddResult, String> {
let storage = get_storage().await?;
let output = Command::new(&cli_path)
.args(["add", &uri])
.stdin(std::process::Stdio::piped())
.stdout(std::process::Stdio::piped())
.stderr(std::process::Stdio::piped())
.spawn()
.map_err(|e| format!("Failed to spawn OpenViking CLI: {}", e))?;
let (agent_id, memory_type, category) = parse_uri(&uri)?;
// Write content to stdin
if let Some(mut stdin) = output.stdin.as_ref() {
use std::io::Write;
stdin.write_all(content.as_bytes())
.map_err(|e| format!("Failed to write to stdin: {}", e))?;
let mut entry = MemoryEntry::new(&agent_id, memory_type, &category, content);
entry.keywords = keywords;
if let Some(imp) = importance {
entry.importance = imp.min(10).max(1);
}
let result = output.wait_with_output()
.map_err(|e| format!("Failed to read output: {}", e))?;
storage
.store(&entry)
.await
.map_err(|e| format!("Failed to store memory: {}", e))?;
if result.status.success() {
Ok(VikingAddResult {
uri,
status: "added".to_string(),
})
} else {
let stderr = String::from_utf8_lossy(&result.stderr).trim().to_string();
Err(if !stderr.is_empty() { stderr } else { "Failed to add resource".to_string() })
}
Ok(VikingAddResult {
uri,
status: "added".to_string(),
})
}
/// Find resources by semantic search
/// Find memories by semantic search
#[tauri::command]
pub fn viking_find(
pub async fn viking_find(
query: String,
scope: Option<String>,
limit: Option<usize>,
) -> Result<Vec<VikingFindResult>, String> {
let mut args = vec!["find", "--json", &query];
let storage = get_storage().await?;
let scope_arg;
if let Some(ref s) = scope {
scope_arg = format!("--scope={}", s);
args.push(&scope_arg);
}
let options = FindOptions {
scope,
limit,
min_similarity: Some(0.1),
};
let limit_arg;
if let Some(l) = limit {
limit_arg = format!("--limit={}", l);
args.push(&limit_arg);
}
let entries = storage
.find(&query, options)
.await
.map_err(|e| format!("Failed to search memories: {}", e))?;
// CLI returns JSON array directly
let output = run_viking_cli(&args)?;
// Handle empty or null results
if output.is_empty() || output == "null" || output == "[]" {
return Ok(Vec::new());
}
serde_json::from_str(&output)
.map_err(|e| format!("Failed to parse find results: {}\nOutput: {}", e, output))
Ok(entries
.into_iter()
.enumerate()
.map(|(i, entry)| VikingFindResult {
uri: entry.uri,
score: 1.0 - (i as f64 * 0.1), // Simple scoring based on rank
content: entry.content,
level: "L1".to_string(),
overview: None,
})
.collect())
}
/// Grep resources by pattern
/// Grep memories by pattern (uses FTS5)
#[tauri::command]
pub fn viking_grep(
pub async fn viking_grep(
pattern: String,
uri: Option<String>,
case_sensitive: Option<bool>,
_case_sensitive: Option<bool>,
limit: Option<usize>,
) -> Result<Vec<VikingGrepResult>, String> {
let mut args = vec!["grep", "--json", &pattern];
let storage = get_storage().await?;
let uri_arg;
if let Some(ref u) = uri {
uri_arg = format!("--uri={}", u);
args.push(&uri_arg);
}
let scope = uri.as_ref().and_then(|u| {
// Extract agent scope from URI
u.strip_prefix("agent://")
.and_then(|s| s.split('/').next())
.map(|agent| format!("agent://{}", agent))
});
if case_sensitive.unwrap_or(false) {
args.push("--case-sensitive");
}
let options = FindOptions {
scope,
limit,
min_similarity: Some(0.05), // Lower threshold for grep
};
let limit_arg;
if let Some(l) = limit {
limit_arg = format!("--limit={}", l);
args.push(&limit_arg);
}
let entries = storage
.find(&pattern, options)
.await
.map_err(|e| format!("Failed to grep memories: {}", e))?;
let output = run_viking_cli(&args)?;
if output.is_empty() || output == "null" || output == "[]" {
return Ok(Vec::new());
}
serde_json::from_str(&output)
.map_err(|e| format!("Failed to parse grep results: {}\nOutput: {}", e, output))
Ok(entries
.into_iter()
.flat_map(|entry| {
// Find matching lines
entry
.content
.lines()
.enumerate()
.filter(|(_, line)| {
line.to_lowercase()
.contains(&pattern.to_lowercase())
})
.map(|(i, line)| VikingGrepResult {
uri: entry.uri.clone(),
line: (i + 1) as u32,
content: line.to_string(),
match_start: line.find(&pattern).unwrap_or(0) as u32,
match_end: (line.find(&pattern).unwrap_or(0) + pattern.len()) as u32,
})
.collect::<Vec<_>>()
})
.take(limit.unwrap_or(100))
.collect())
}
/// List resources at a path
/// List memories at a path
#[tauri::command]
pub fn viking_ls(path: String) -> Result<Vec<VikingResource>, String> {
let output = run_viking_cli(&["ls", "--json", &path])?;
pub async fn viking_ls(path: String) -> Result<Vec<VikingResource>, String> {
let storage = get_storage().await?;
if output.is_empty() || output == "null" || output == "[]" {
return Ok(Vec::new());
let entries = storage
.find_by_prefix(&path)
.await
.map_err(|e| format!("Failed to list memories: {}", e))?;
Ok(entries
.into_iter()
.map(|entry| VikingResource {
uri: entry.uri.clone(),
name: entry
.uri
.rsplit('/')
.next()
.unwrap_or(&entry.uri)
.to_string(),
resource_type: entry.memory_type.to_string(),
size: Some(entry.content.len() as u64),
modified_at: Some(entry.last_accessed.to_rfc3339()),
})
.collect())
}
/// Read memory content
#[tauri::command]
pub async fn viking_read(uri: String, _level: Option<String>) -> Result<String, String> {
let storage = get_storage().await?;
let entry = storage
.get(&uri)
.await
.map_err(|e| format!("Failed to read memory: {}", e))?;
match entry {
Some(e) => Ok(e.content),
None => Err(format!("Memory not found: {}", uri)),
}
serde_json::from_str(&output)
.map_err(|e| format!("Failed to parse ls results: {}\nOutput: {}", e, output))
}
/// Read resource content
/// Remove a memory
#[tauri::command]
pub fn viking_read(uri: String, level: Option<String>) -> Result<String, String> {
let level_val = level.unwrap_or_else(|| "L1".to_string());
let level_arg = format!("--level={}", level_val);
pub async fn viking_remove(uri: String) -> Result<(), String> {
let storage = get_storage().await?;
run_viking_cli(&["read", &uri, &level_arg])
}
storage
.delete(&uri)
.await
.map_err(|e| format!("Failed to remove memory: {}", e))?;
/// Remove a resource
#[tauri::command]
pub fn viking_remove(uri: String) -> Result<(), String> {
run_viking_cli(&["remove", &uri])?;
Ok(())
}
/// Get resource tree
/// Get memory tree
#[tauri::command]
pub fn viking_tree(path: String, depth: Option<usize>) -> Result<serde_json::Value, String> {
let depth_val = depth.unwrap_or(2);
let depth_arg = format!("--depth={}", depth_val);
pub async fn viking_tree(path: String, _depth: Option<usize>) -> Result<serde_json::Value, String> {
let storage = get_storage().await?;
let output = run_viking_cli(&["tree", "--json", &path, &depth_arg])?;
let entries = storage
.find_by_prefix(&path)
.await
.map_err(|e| format!("Failed to get tree: {}", e))?;
if output.is_empty() || output == "null" {
return Ok(serde_json::json!({}));
// Build a simple tree structure
let mut tree = serde_json::Map::new();
for entry in entries {
let parts: Vec<&str> = entry.uri.split('/').collect();
let mut current = &mut tree;
for part in &parts[..parts.len().saturating_sub(1)] {
if !current.contains_key(*part) {
current.insert(
(*part).to_string(),
serde_json::json!({}),
);
}
current = current
.get_mut(*part)
.and_then(|v| v.as_object_mut())
.unwrap();
}
if let Some(last) = parts.last() {
current.insert(
(*last).to_string(),
serde_json::json!({
"type": entry.memory_type.to_string(),
"importance": entry.importance,
"access_count": entry.access_count,
}),
);
}
}
serde_json::from_str(&output)
.map_err(|e| format!("Failed to parse tree result: {}\nOutput: {}", e, output))
Ok(serde_json::Value::Object(tree))
}
/// Inject memories into prompt (for agent loop integration)
#[tauri::command]
pub async fn viking_inject_prompt(
agent_id: String,
base_prompt: String,
user_input: String,
max_tokens: Option<usize>,
) -> Result<String, String> {
let storage = get_storage().await?;
// Retrieve relevant memories
let options = FindOptions {
scope: Some(format!("agent://{}", agent_id)),
limit: Some(10),
min_similarity: Some(0.3),
};
let entries = storage
.find(&user_input, options)
.await
.map_err(|e| format!("Failed to retrieve memories: {}", e))?;
// Convert to RetrievalResult
let mut result = RetrievalResult::default();
for entry in entries {
match entry.memory_type {
MemoryType::Preference => result.preferences.push(entry),
MemoryType::Knowledge => result.knowledge.push(entry),
MemoryType::Experience => result.experience.push(entry),
MemoryType::Session => {} // Skip session memories
}
}
// Calculate tokens
result.total_tokens = result.calculate_tokens();
// Apply token budget
let budget = max_tokens.unwrap_or(500);
if result.total_tokens > budget {
// Truncate by priority: preferences > knowledge > experience
while result.total_tokens > budget && !result.experience.is_empty() {
result.experience.pop();
result.total_tokens = result.calculate_tokens();
}
while result.total_tokens > budget && !result.knowledge.is_empty() {
result.knowledge.pop();
result.total_tokens = result.calculate_tokens();
}
while result.total_tokens > budget && !result.preferences.is_empty() {
result.preferences.pop();
result.total_tokens = result.calculate_tokens();
}
}
// Inject into prompt
let injector = PromptInjector::new();
Ok(injector.inject_with_format(&base_prompt, &result))
}
// === Helper Functions ===
/// Parse URI to extract components
fn parse_uri(uri: &str) -> Result<(String, MemoryType, String), String> {
// Expected format: agent://{agent_id}/{type}/{category}
let without_prefix = uri
.strip_prefix("agent://")
.ok_or_else(|| format!("Invalid URI format: {}", uri))?;
let parts: Vec<&str> = without_prefix.splitn(3, '/').collect();
if parts.len() < 3 {
return Err(format!("Invalid URI format, expected agent://{{agent_id}}/{{type}}/{{category}}: {}", uri));
}
let agent_id = parts[0].to_string();
let memory_type = MemoryType::parse(parts[1]);
let category = parts[2].to_string();
Ok((agent_id, memory_type, category))
}
// === Tests ===
@@ -361,10 +468,19 @@ pub fn viking_tree(path: String, depth: Option<usize>) -> Result<serde_json::Val
mod tests {
use super::*;
#[tokio::test]
async fn test_parse_uri() {
let (agent_id, memory_type, category) =
parse_uri("agent://test-agent/preferences/style").unwrap();
assert_eq!(agent_id, "test-agent");
assert_eq!(memory_type, MemoryType::Preference);
assert_eq!(category, "style");
}
#[test]
fn test_status_unavailable_without_cli() {
// This test will fail if ov is installed, which is fine
let result = viking_status();
assert!(result.is_ok());
fn test_invalid_uri() {
assert!(parse_uri("invalid-uri").is_err());
assert!(parse_uri("agent://only-agent").is_err());
}
}