Revert "Merge pull request #3341 from ultraworkers/fix/rebase-on-main"

This reverts commit 734558eb31, reversing
changes made to 942805175a.
This commit is contained in:
clawdbot committed 2026-10-13 00:14:54 +00:00
1 parent 734558eb31
commit 350e907e35
26 files changed
+1161 -3940

No files matched your search

+26 -11
View File
@@ -29,7 +29,7 @@ impl Default for TridentConfig {
}
/// Statistics from a Trident compaction run.
#[derive(Debug, Clone, PartialEq, Eq, Default)]
#[derive(Debug, Clone, PartialEq, Eq)]
pub struct TridentStats {
pub superseded_count: usize,
pub collapsed_chains: usize,
@@ -41,6 +41,21 @@ pub struct TridentStats {
pub final_message_count: usize,
}
impl Default for TridentStats {
fn default() -> Self {
Self {
superseded_count: 0,
collapsed_chains: 0,
messages_collapsed: 0,
clusters_found: 0,
messages_clustered: 0,
tokens_saved_estimate: 0,
original_message_count: 0,
final_message_count: 0,
}
}
}
impl TridentStats {
pub fn format_report(&self) -> String {
let compression = if self.final_message_count > 0 {
@@ -177,7 +192,7 @@ fn stage1_supersede(messages: &[ConversationMessage]) -> (Vec<ConversationMessag
let mut obsolete_indices: BTreeSet<usize> = BTreeSet::new();
for ops in file_ops.values() {
for (_path, ops) in &file_ops {
if ops.len() < 2 {
continue;
}
@@ -190,9 +205,9 @@ fn stage1_supersede(messages: &[ConversationMessage]) -> (Vec<ConversationMessag
if let Some(last_write) = last_write_idx {
for op in ops {
if (op.op_type == FileOp::Read
|| op.op_type == FileOp::Write
|| op.op_type == FileOp::Edit)
if op.op_type == FileOp::Read && op.index < last_write {
obsolete_indices.insert(op.index);
} else if (op.op_type == FileOp::Write || op.op_type == FileOp::Edit)
&& op.index < last_write
{
obsolete_indices.insert(op.index);
@@ -310,7 +325,7 @@ fn stage2_collapse(
usage: None,
});
} else {
result.append(&mut buffer);
result.extend(buffer.drain(..));
}
buffer.clear();
result.push(msg.clone());
@@ -461,7 +476,7 @@ fn stage3_cluster(
}
let total_clustered: usize = cluster_assignments.len();
let clusters_found = cluster_id;
let clusters_found = cluster_id as usize;
let mut result: Vec<ConversationMessage> = Vec::new();
let mut cluster_buffers: BTreeMap<usize, Vec<usize>> = BTreeMap::new();
@@ -662,7 +677,7 @@ fn truncate_text(text: &str, max_chars: usize) -> String {
mod tests {
use super::*;
use crate::compact::CompactionConfig;
use crate::session::{ContentBlock, ConversationMessage, Session};
use crate::session::{ContentBlock, ConversationMessage, MessageRole, Session};
#[test]
fn stage1_removes_obsolete_file_reads() {
@@ -721,7 +736,7 @@ mod tests {
fn stage2_collapses_chatty_messages() {
let mut messages = vec![];
for i in 0..6 {
messages.push(ConversationMessage::user_text(format!("ok {i}")));
messages.push(ConversationMessage::user_text(&format!("ok {i}")));
messages.push(ConversationMessage::assistant(vec![ContentBlock::Text {
text: format!("got {i}"),
}]));
@@ -752,9 +767,9 @@ mod tests {
},
]));
messages.push(ConversationMessage::tool_result(
format!("read_{i}"),
&format!("read_{i}"),
"read_file",
format!(r#"{{"path":"src/{i}.rs","content":"data {i}"}}"#),
&format!(r#"{{"path":"src/{i}.rs","content":"data {i}"}}"#),
false,
));
}