d0zingcat/claude-code
1
0
Fork 0
mirror of https://github.com/instructkr/claude-code.git synced 2026-06-06 04:06:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3216 from TheArchitectit/worktree-session-resume-fixes

Browse Source 
fix: session resume — scan all workspaces, skip current empty session
This commit is contained in:
Bellman
2026-06-05 10:38:19 +09:00
committed by GitHub
parent b90f18f75a 346772a8b3
commit 114c2da9fc
2 changed files with 223 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8431,7 +8431,8 @@ impl LiveCli {
return Ok(false);
};
let (handle, session) = load_session_reference(&session_ref)?;
let (handle, session) =
load_session_reference_excluding(&session_ref, Some(&self.session.id))?;
let message_count = session.messages.len();
let session_id = session.session_id.clone();
let runtime = build_runtime(
@@ -9127,17 +9128,18 @@ fn latest_managed_session() -> Result<ManagedSessionSummary, Box<dyn std::error:
fn load_session_reference(
reference: &str,
) -> Result<(SessionHandle, Session), Box<dyn std::error::Error>> {
load_session_reference_excluding(reference, None)
}
fn load_session_reference_excluding(
reference: &str,
exclude_id: Option<&str>,
) -> Result<(SessionHandle, Session), Box<dyn std::error::Error>> {
let store = current_session_store()?;
// For alias references ("latest", "last", "recent"), allow cross-workspace
// resume so /resume latest finds the most recent session globally.
// For explicit references, workspace validation is enforced.
let result = if runtime::session_control::is_session_reference_alias(reference) {
store.load_session_loose(reference)
} else {
store.load_session(reference)
};
let loaded = result.map_err(|e| Box::new(e) as Box<dyn std::error::Error>)?;
let loaded = store
.load_session_excluding(reference, exclude_id)
.map_err(|e| Box::new(e) as Box<dyn std::error::Error>)?;
Ok((
SessionHandle {
id: loaded.handle.id,
@@ -18386,16 +18388,26 @@ UU conflicted.rs",
std::env::set_current_dir(&workspace).expect("switch cwd");
let older = create_managed_session_handle("session-older").expect("older handle");
Session::new()
.with_persistence_path(older.path.clone())
.save_to_path(&older.path)
.expect("older session should save");
{
let mut session = Session::new().with_persistence_path(older.path.clone());
session
.push_user_text("older session message")
.expect("older message should save");
session
.save_to_path(&older.path)
.expect("older session should save");
}
std::thread::sleep(Duration::from_millis(20));
let newer = create_managed_session_handle("session-newer").expect("newer handle");
Session::new()
.with_persistence_path(newer.path.clone())
.save_to_path(&newer.path)
.expect("newer session should save");
{
let mut session = Session::new().with_persistence_path(newer.path.clone());
session
.push_user_text("newer session message")
.expect("newer message should save");
session
.save_to_path(&newer.path)
.expect("newer session should save");
}
let resolved = resolve_session_reference("latest").expect("latest session should resolve");
assert_eq!(