elias/claw-code
1
0
Fork 0
mirror of https://github.com/ultraworkers/claw-code.git synced 2026-05-30 20:04:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: cargo fmt --all on fix-160 branch

Browse Source
This commit is contained in:
YeonGyu-Kim 2026-05-25 12:04:48 +09:00
parent 3489ec51d5
commit 1f330c6737
2 changed files with 115 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
rust/crates/runtime/src/session_control.rs
View File

@ -1242,22 +1242,31 @@ mod tests {
let session = persist_session_via_store(&store, "160 regression test"); let session = persist_session_via_store(&store, "160 regression test");
// when/then — session exists and is listed before deletion // when/then — session exists and is listed before deletion
assert!(!store.list_sessions().expect("list").is_empty(), assert!(
"store should have at least one session"); !store.list_sessions().expect("list").is_empty(),
assert!(store.session_exists(&session.session_id), "store should have at least one session"
"session should exist before deletion"); );
assert!(
store.session_exists(&session.session_id),
"session should exist before deletion"
);
// when — delete the session // when — delete the session
let deleted = store.delete_session(&session.session_id) let deleted = store
.delete_session(&session.session_id)
.expect("delete should succeed"); .expect("delete should succeed");
// then — session is gone // then — session is gone
assert_eq!(deleted.id, session.session_id); assert_eq!(deleted.id, session.session_id);
assert!(!deleted.path.exists(), "session file should be removed"); assert!(!deleted.path.exists(), "session file should be removed");
assert!(!store.session_exists(&session.session_id), assert!(
"session should not exist after deletion"); !store.session_exists(&session.session_id),
assert!(store.list_sessions().expect("list").is_empty(), "session should not exist after deletion"
"store should have no sessions after deletion"); );
assert!(
store.list_sessions().expect("list").is_empty(),
"store should have no sessions after deletion"
);
fs::remove_dir_all(base).expect("temp dir should clean up"); fs::remove_dir_all(base).expect("temp dir should clean up");
} }

143
rust/crates/runtime/src/trident.rs
View File

@ -78,7 +78,10 @@ impl TridentStats {
self.messages_clustered, self.clusters_found self.messages_clustered, self.clusters_found
), ),
format!(" Original: {} messages", self.original_message_count), format!(" Original: {} messages", self.original_message_count),
format!(" Final: {} messages ({:.1}x compression)", self.final_message_count, compression), format!(
" Final: {} messages ({:.1}x compression)",
self.final_message_count, compression
),
]; ];
if self.tokens_saved_estimate > 0 { if self.tokens_saved_estimate > 0 {
lines.push(format!( lines.push(format!(
@ -121,7 +124,8 @@ pub fn trident_compact_session(
} }
if trident_config.collapse_enabled { if trident_config.collapse_enabled {
let (collapsed, chains, collapsed_count) = stage2_collapse(&messages, trident_config.collapse_threshold); let (collapsed, chains, collapsed_count) =
stage2_collapse(&messages, trident_config.collapse_threshold);
stats.collapsed_chains = chains; stats.collapsed_chains = chains;
stats.messages_collapsed = collapsed_count; stats.messages_collapsed = collapsed_count;
messages = collapsed; messages = collapsed;
@ -178,10 +182,10 @@ fn stage1_supersede(messages: &[ConversationMessage]) -> (Vec<ConversationMessag
for (i, msg) in messages.iter().enumerate() { for (i, msg) in messages.iter().enumerate() {
for block in &msg.blocks { for block in &msg.blocks {
if let Some((path, op_type)) = extract_file_operation(block) { if let Some((path, op_type)) = extract_file_operation(block) {
file_ops.entry(path).or_default().push(FileOperation { file_ops
index: i, .entry(path)
op_type, .or_default()
}); .push(FileOperation { index: i, op_type });
} }
} }
} }
@ -235,7 +239,9 @@ fn extract_file_operation(block: &ContentBlock) -> Option<(String, FileOp)> {
}; };
Some((path, op_type)) Some((path, op_type))
} }
ContentBlock::ToolResult { tool_name, output, .. } => { ContentBlock::ToolResult {
tool_name, output, ..
} => {
let path = extract_path_from_tool_output(tool_name, output)?; let path = extract_path_from_tool_output(tool_name, output)?;
let op_type = match tool_name.as_str() { let op_type = match tool_name.as_str() {
"read_file" | "Read" => FileOp::Read, "read_file" | "Read" => FileOp::Read,
@ -251,8 +257,10 @@ fn extract_file_operation(block: &ContentBlock) -> Option<(String, FileOp)> {
} }
fn extract_path_from_tool_input(tool_name: &str, input: &str) -> Option<String> { fn extract_path_from_tool_input(tool_name: &str, input: &str) -> Option<String> {
if !matches!(tool_name, "read_file" | "write_file" | "edit_file" | "Read" | "Write" | "Edit") if !matches!(
{ tool_name,
"read_file" | "write_file" | "edit_file" | "Read" | "Write" | "Edit"
) {
return None; return None;
} }
serde_json::from_str::<serde_json::Value>(input) serde_json::from_str::<serde_json::Value>(input)
@ -266,8 +274,10 @@ fn extract_path_from_tool_input(tool_name: &str, input: &str) -> Option<String>
} }
fn extract_path_from_tool_output(tool_name: &str, output: &str) -> Option<String> { fn extract_path_from_tool_output(tool_name: &str, output: &str) -> Option<String> {
if !matches!(tool_name, "read_file" | "write_file" | "edit_file" | "Read" | "Write" | "Edit") if !matches!(
{ tool_name,
"read_file" | "write_file" | "edit_file" | "Read" | "Write" | "Edit"
) {
return None; return None;
} }
serde_json::from_str::<serde_json::Value>(output) serde_json::from_str::<serde_json::Value>(output)
@ -341,15 +351,25 @@ fn stage2_collapse(
} }
fn is_chatty_message(msg: &ConversationMessage) -> bool { fn is_chatty_message(msg: &ConversationMessage) -> bool {
let total_chars: usize = msg.blocks.iter().map(|b| match b { let total_chars: usize = msg
ContentBlock::Text { text } => text.len(), .blocks
ContentBlock::ToolUse { input, .. } => input.len(), .iter()
ContentBlock::ToolResult { output, .. } => output.len(), .map(|b| match b {
ContentBlock::Thinking { thinking, .. } => thinking.len(), ContentBlock::Text { text } => text.len(),
}).sum(); ContentBlock::ToolUse { input, .. } => input.len(),
ContentBlock::ToolResult { output, .. } => output.len(),
ContentBlock::Thinking { thinking, .. } => thinking.len(),
})
.sum();
let has_tool_use = msg.blocks.iter().any(|b| matches!(b, ContentBlock::ToolUse { .. })); let has_tool_use = msg
let has_tool_result = msg.blocks.iter().any(|b| matches!(b, ContentBlock::ToolResult { .. })); .blocks
.iter()
.any(|b| matches!(b, ContentBlock::ToolUse { .. }));
let has_tool_result = msg
.blocks
.iter()
.any(|b| matches!(b, ContentBlock::ToolResult { .. }));
if has_tool_use || has_tool_result { if has_tool_use || has_tool_result {
return false; return false;
@ -465,16 +485,12 @@ fn stage3_cluster(
cluster_buffers.entry(cid).or_default().push(*msg_idx); cluster_buffers.entry(cid).or_default().push(*msg_idx);
} }
for (i, msg) in messages.iter().enumerate() { for (i, msg) in messages.iter().enumerate() {
if let Some(&cid) = cluster_assignments.get(&i) { if let Some(&cid) = cluster_assignments.get(&i) {
if let Some(buffer) = cluster_buffers.get_mut(&cid) { if let Some(buffer) = cluster_buffers.get_mut(&cid) {
if buffer[0] == i { if buffer[0] == i {
let cluster_messages: Vec<&ConversationMessage> = buffer let cluster_messages: Vec<&ConversationMessage> =
.iter() buffer.iter().filter_map(|&idx| messages.get(idx)).collect();
.filter_map(|&idx| messages.get(idx))
.collect();
let summary = generate_cluster_summary(&cluster_messages); let summary = generate_cluster_summary(&cluster_messages);
result.push(ConversationMessage { result.push(ConversationMessage {
role: MessageRole::System, role: MessageRole::System,
@ -520,7 +536,9 @@ fn fingerprint_message(index: usize, msg: &ConversationMessage) -> Option<Messag
} }
text_length += input.len(); text_length += input.len();
} }
ContentBlock::ToolResult { tool_name, output, .. } => { ContentBlock::ToolResult {
tool_name, output, ..
} => {
tool_names.insert(tool_name.clone()); tool_names.insert(tool_name.clone());
if let Some(path) = extract_path_from_tool_output(tool_name, output) { if let Some(path) = extract_path_from_tool_output(tool_name, output) {
file_paths.insert(path); file_paths.insert(path);
@ -596,7 +614,9 @@ fn generate_cluster_summary(messages: &[&ConversationMessage]) -> String {
file_paths.insert(path); file_paths.insert(path);
} }
} }
ContentBlock::ToolResult { tool_name, output, .. } => { ContentBlock::ToolResult {
tool_name, output, ..
} => {
tool_names.insert(tool_name.clone()); tool_names.insert(tool_name.clone());
if let Some(path) = extract_path_from_tool_output(tool_name, output) { if let Some(path) = extract_path_from_tool_output(tool_name, output) {
file_paths.insert(path); file_paths.insert(path);
@ -641,7 +661,7 @@ fn estimate_message_tokens(message: &ConversationMessage) -> usize {
} => (tool_name.len() + output.len()) / 4 + 1, } => (tool_name.len() + output.len()) / 4 + 1,
ContentBlock::Thinking { thinking, .. } => thinking.len() / 4 + 1, ContentBlock::Thinking { thinking, .. } => thinking.len() / 4 + 1,
}) })
.sum() .sum()
} }
fn truncate_text(text: &str, max_chars: usize) -> String { fn truncate_text(text: &str, max_chars: usize) -> String {
@ -667,13 +687,23 @@ mod tests {
name: "read_file".to_string(), name: "read_file".to_string(),
input: r#"{"path":"src/main.rs"}"#.to_string(), input: r#"{"path":"src/main.rs"}"#.to_string(),
}]), }]),
ConversationMessage::tool_result("1", "read_file", r#"{"path":"src/main.rs","content":"old"}"#, false), ConversationMessage::tool_result(
"1",
"read_file",
r#"{"path":"src/main.rs","content":"old"}"#,
false,
),
ConversationMessage::assistant(vec![ContentBlock::ToolUse { ConversationMessage::assistant(vec![ContentBlock::ToolUse {
id: "2".to_string(), id: "2".to_string(),
name: "edit_file".to_string(), name: "edit_file".to_string(),
input: r#"{"path":"src/main.rs","old":"old","new":"new"}"#.to_string(), input: r#"{"path":"src/main.rs","old":"old","new":"new"}"#.to_string(),
}]), }]),
ConversationMessage::tool_result("2", "edit_file", r#"{"path":"src/main.rs","ok":true}"#, false), ConversationMessage::tool_result(
"2",
"edit_file",
r#"{"path":"src/main.rs","ok":true}"#,
false,
),
]; ];
let (kept, superseded) = stage1_supersede(&messages); let (kept, superseded) = stage1_supersede(&messages);
@ -689,7 +719,12 @@ mod tests {
name: "read_file".to_string(), name: "read_file".to_string(),
input: r#"{"path":"src/main.rs"}"#.to_string(), input: r#"{"path":"src/main.rs"}"#.to_string(),
}]), }]),
ConversationMessage::tool_result("1", "read_file", r#"{"path":"src/main.rs","content":"data"}"#, false), ConversationMessage::tool_result(
"1",
"read_file",
r#"{"path":"src/main.rs","content":"data"}"#,
false,
),
]; ];
let (kept, superseded) = stage1_supersede(&messages); let (kept, superseded) = stage1_supersede(&messages);
@ -706,11 +741,13 @@ mod tests {
text: format!("got {i}"), text: format!("got {i}"),
}])); }]));
} }
messages.push(ConversationMessage::assistant(vec![ContentBlock::ToolUse { messages.push(ConversationMessage::assistant(vec![
id: "t".to_string(), ContentBlock::ToolUse {
name: "bash".to_string(), id: "t".to_string(),
input: r#"{"command":"ls"}"#.to_string(), name: "bash".to_string(),
}])); input: r#"{"command":"ls"}"#.to_string(),
},
]));
let (result, chains, collapsed) = stage2_collapse(&messages, 4); let (result, chains, collapsed) = stage2_collapse(&messages, 4);
assert!(chains > 0, "should collapse at least one chain"); assert!(chains > 0, "should collapse at least one chain");
@ -722,11 +759,13 @@ mod tests {
fn stage3_clusters_similar_messages() { fn stage3_clusters_similar_messages() {
let mut messages = vec![]; let mut messages = vec![];
for i in 0..5 { for i in 0..5 {
messages.push(ConversationMessage::assistant(vec![ContentBlock::ToolUse { messages.push(ConversationMessage::assistant(vec![
id: format!("read_{i}"), ContentBlock::ToolUse {
name: "read_file".to_string(), id: format!("read_{i}"),
input: format!(r#"{{"path":"src/{i}.rs"}}"#), name: "read_file".to_string(),
}])); input: format!(r#"{{"path":"src/{i}.rs"}}"#),
},
]));
messages.push(ConversationMessage::tool_result( messages.push(ConversationMessage::tool_result(
&format!("read_{i}"), &format!("read_{i}"),
"read_file", "read_file",
@ -735,8 +774,7 @@ mod tests {
)); ));
} }
let (result, clusters, clustered) = let (result, clusters, clustered) = stage3_cluster(&messages, 3, 0.4);
stage3_cluster(&messages, 3, 0.4);
assert!(clusters > 0, "should find at least one cluster"); assert!(clusters > 0, "should find at least one cluster");
assert!(clustered > 0); assert!(clustered > 0);
assert!(result.len() < messages.len()); assert!(result.len() < messages.len());
@ -752,13 +790,23 @@ mod tests {
name: "read_file".to_string(), name: "read_file".to_string(),
input: r#"{"path":"src/main.rs"}"#.to_string(), input: r#"{"path":"src/main.rs"}"#.to_string(),
}]), }]),
ConversationMessage::tool_result("1", "read_file", r#"{"path":"src/main.rs","content":"fn main() { buggy }"}"#, false), ConversationMessage::tool_result(
"1",
"read_file",
r#"{"path":"src/main.rs","content":"fn main() { buggy }"}"#,
false,
),
ConversationMessage::assistant(vec![ContentBlock::ToolUse { ConversationMessage::assistant(vec![ContentBlock::ToolUse {
id: "2".to_string(), id: "2".to_string(),
name: "edit_file".to_string(), name: "edit_file".to_string(),
input: r#"{"path":"src/main.rs","old":"buggy","new":"fixed"}"#.to_string(), input: r#"{"path":"src/main.rs","old":"buggy","new":"fixed"}"#.to_string(),
}]), }]),
ConversationMessage::tool_result("2", "edit_file", r#"{"path":"src/main.rs","ok":true}"#, false), ConversationMessage::tool_result(
"2",
"edit_file",
r#"{"path":"src/main.rs","ok":true}"#,
false,
),
ConversationMessage::assistant(vec![ContentBlock::Text { ConversationMessage::assistant(vec![ContentBlock::Text {
text: "Fixed the bug in main.rs".to_string(), text: "Fixed the bug in main.rs".to_string(),
}]), }]),
@ -774,7 +822,10 @@ mod tests {
&trident_config, &trident_config,
); );
assert!(result.removed_message_count > 0 || result.compacted_session.messages.len() < session.messages.len()); assert!(
result.removed_message_count > 0
|| result.compacted_session.messages.len() < session.messages.len()
);
} }
#[test] #[test]