eeymoo/claw-code
1
0
Fork 0
mirror of https://github.com/instructkr/claw-code.git synced 2026-06-05 22:17:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: /clear preserves session_id to prevent resume divergence (#114)

Browse Source 
/resume mode /clear now preserves the original session_id instead of
generating a new one. This prevents the filename/meta-header divergence
where /session list reported an id that --resume couldn't find.

Generated with https://github.com/Yeachan-Heo/gajae-code
Co-authored-by: Gajae Code <dev@gajae-code.com>
This commit is contained in:
bellman
2026-06-05 09:47:37 +09:00
parent cb027adf65
commit b8cbb1834f
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
rust/crates/rusty-claude-cli/src/main.rs
View File

@@ -6477,14 +6477,16 @@ fn run_resume_command(
});
}
let backup_path = write_session_clear_backup(session, session_path)?;
// #114: preserve the session_id from the file to avoid filename/meta-header
// divergence. /clear is "empty this session," not "fork to a new session."
let previous_session_id = session.session_id.clone();
let cleared = new_cli_session()?;
let new_session_id = cleared.session_id.clone();
let mut cleared = new_cli_session()?;
cleared.session_id = previous_session_id.clone();
cleared.save_to_path(session_path)?;
Ok(ResumeCommandOutcome {
session: cleared,
message: Some(format!(
"Session cleared\n Mode resumed session reset\n Previous session {previous_session_id}\n Backup {}\n Resume previous claw --resume {}\n New session {new_session_id}\n Session file {}",
"Session cleared\n Mode resumed session reset\n Previous session {previous_session_id}\n Backup {}\n Resume previous claw --resume {}\n Session file {}",
backup_path.display(),
backup_path.display(),
session_path.display()
@@ -6492,7 +6494,7 @@ fn run_resume_command(
json: Some(serde_json::json!({
"kind": "clear",
"previous_session_id": previous_session_id,
"new_session_id": new_session_id,
"new_session_id": previous_session_id,
"backup": backup_path.display().to_string(),
"session_file": session_path.display().to_string(),
})),