mirror of
https://github.com/instructkr/claw-code.git
synced 2026-04-03 20:54:48 +08:00
Preserve local project context across compaction and todo updates
This change makes compaction summaries durable under .claude/memory, feeds those saved memory files back into prompt context, updates /memory to report both instruction and project-memory files, and moves TodoWrite persistence to a human-readable .claude/todos.md file. Constraint: Reuse existing compaction, prompt loading, and slash-command plumbing rather than add a new subsystem Constraint: Keep persisted project state under Claude-local .claude/ paths Rejected: Introduce a dedicated memory service module | larger diff with no clear user benefit for this task Confidence: high Scope-risk: moderate Reversibility: clean Directive: Project memory files are loaded as prompt context, so future format changes must preserve concise readable content Tested: cargo fmt --all --manifest-path rust/Cargo.toml Tested: cargo clippy --manifest-path rust/Cargo.toml --all-targets --all-features -- -D warnings Tested: cargo test --manifest-path rust/Cargo.toml --all Not-tested: Long-term retention/cleanup policy for .claude/memory growth
This commit is contained in:
@@ -1,3 +1,6 @@
|
||||
use std::fs;
|
||||
use std::time::{SystemTime, UNIX_EPOCH};
|
||||
|
||||
use crate::session::{ContentBlock, ConversationMessage, MessageRole, Session};
|
||||
|
||||
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
||||
@@ -90,6 +93,7 @@ pub fn compact_session(session: &Session, config: CompactionConfig) -> Compactio
|
||||
let preserved = session.messages[keep_from..].to_vec();
|
||||
let summary = summarize_messages(removed);
|
||||
let formatted_summary = format_compact_summary(&summary);
|
||||
persist_compact_summary(&formatted_summary);
|
||||
let continuation = get_compact_continuation_message(&summary, true, !preserved.is_empty());
|
||||
|
||||
let mut compacted_messages = vec![ConversationMessage {
|
||||
@@ -110,6 +114,35 @@ pub fn compact_session(session: &Session, config: CompactionConfig) -> Compactio
|
||||
}
|
||||
}
|
||||
|
||||
fn persist_compact_summary(formatted_summary: &str) {
|
||||
if formatted_summary.trim().is_empty() {
|
||||
return;
|
||||
}
|
||||
|
||||
let Ok(cwd) = std::env::current_dir() else {
|
||||
return;
|
||||
};
|
||||
let memory_dir = cwd.join(".claude").join("memory");
|
||||
if fs::create_dir_all(&memory_dir).is_err() {
|
||||
return;
|
||||
}
|
||||
|
||||
let path = memory_dir.join(compact_summary_filename());
|
||||
let _ = fs::write(path, render_memory_file(formatted_summary));
|
||||
}
|
||||
|
||||
fn compact_summary_filename() -> String {
|
||||
let timestamp = SystemTime::now()
|
||||
.duration_since(UNIX_EPOCH)
|
||||
.unwrap_or_default()
|
||||
.as_secs();
|
||||
format!("summary-{timestamp}.md")
|
||||
}
|
||||
|
||||
fn render_memory_file(formatted_summary: &str) -> String {
|
||||
format!("# Project memory\n\n{}\n", formatted_summary.trim())
|
||||
}
|
||||
|
||||
fn summarize_messages(messages: &[ConversationMessage]) -> String {
|
||||
let user_messages = messages
|
||||
.iter()
|
||||
@@ -378,14 +411,21 @@ fn collapse_blank_lines(content: &str) -> String {
|
||||
mod tests {
|
||||
use super::{
|
||||
collect_key_files, compact_session, estimate_session_tokens, format_compact_summary,
|
||||
infer_pending_work, should_compact, CompactionConfig,
|
||||
infer_pending_work, render_memory_file, should_compact, CompactionConfig,
|
||||
};
|
||||
use std::fs;
|
||||
use std::time::{SystemTime, UNIX_EPOCH};
|
||||
|
||||
use crate::session::{ContentBlock, ConversationMessage, MessageRole, Session};
|
||||
|
||||
#[test]
|
||||
fn formats_compact_summary_like_upstream() {
|
||||
let summary = "<analysis>scratch</analysis>\n<summary>Kept work</summary>";
|
||||
assert_eq!(format_compact_summary(summary), "Summary:\nKept work");
|
||||
assert_eq!(
|
||||
render_memory_file("Summary:\nKept work"),
|
||||
"# Project memory\n\nSummary:\nKept work\n"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
@@ -402,6 +442,63 @@ mod tests {
|
||||
assert!(result.formatted_summary.is_empty());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn persists_compacted_summaries_under_dot_claude_memory() {
|
||||
let _guard = crate::test_env_lock();
|
||||
let temp = std::env::temp_dir().join(format!(
|
||||
"runtime-compact-memory-{}",
|
||||
SystemTime::now()
|
||||
.duration_since(UNIX_EPOCH)
|
||||
.expect("time after epoch")
|
||||
.as_nanos()
|
||||
));
|
||||
fs::create_dir_all(&temp).expect("temp dir");
|
||||
let previous = std::env::current_dir().expect("cwd");
|
||||
std::env::set_current_dir(&temp).expect("set cwd");
|
||||
|
||||
let session = Session {
|
||||
version: 1,
|
||||
messages: vec![
|
||||
ConversationMessage::user_text("one ".repeat(200)),
|
||||
ConversationMessage::assistant(vec![ContentBlock::Text {
|
||||
text: "two ".repeat(200),
|
||||
}]),
|
||||
ConversationMessage::tool_result("1", "bash", "ok ".repeat(200), false),
|
||||
ConversationMessage {
|
||||
role: MessageRole::Assistant,
|
||||
blocks: vec![ContentBlock::Text {
|
||||
text: "recent".to_string(),
|
||||
}],
|
||||
usage: None,
|
||||
},
|
||||
],
|
||||
};
|
||||
|
||||
let result = compact_session(
|
||||
&session,
|
||||
CompactionConfig {
|
||||
preserve_recent_messages: 2,
|
||||
max_estimated_tokens: 1,
|
||||
},
|
||||
);
|
||||
let memory_dir = temp.join(".claude").join("memory");
|
||||
let files = fs::read_dir(&memory_dir)
|
||||
.expect("memory dir exists")
|
||||
.flatten()
|
||||
.map(|entry| entry.path())
|
||||
.collect::<Vec<_>>();
|
||||
|
||||
assert_eq!(result.removed_message_count, 2);
|
||||
assert_eq!(files.len(), 1);
|
||||
let persisted = fs::read_to_string(&files[0]).expect("memory file readable");
|
||||
|
||||
std::env::set_current_dir(previous).expect("restore cwd");
|
||||
fs::remove_dir_all(temp).expect("cleanup temp dir");
|
||||
|
||||
assert!(persisted.contains("# Project memory"));
|
||||
assert!(persisted.contains("Summary:"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn compacts_older_messages_into_a_system_summary() {
|
||||
let session = Session {
|
||||
|
||||
Reference in New Issue
Block a user