Skip to content

fix: preserve remote session identity across session restore paths #1320

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wsp1911 merged 4 commits into from
Jun 26, 2026
Merged

fix: preserve remote session identity across session restore paths #1320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
aa9f7a9
fix(agentic): preserve remote session identity across cron and sessio…
wsp1911 Jun 26, 2026
a18e19f
fix: restore remote sessions from resolved storage dirs
wsp1911 Jun 26, 2026
33708f7
fix: preserve session restore path semantics
wsp1911 Jun 26, 2026
3a714ef
fix: shorten generated cron job ids
wsp1911 Jun 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/apps/cli/src/agent/core_adapter.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,8 @@ impl Agent for CoreAgentAdapter {
Some(turn_id.clone()),
agent_type.to_string(),
Some(self.workspace_path_string()),
None,
None,
DialogSubmissionPolicy::for_source(DialogTriggerSource::Cli),
None,
)
Expand All @@ -252,6 +254,8 @@ impl Agent for CoreAgentAdapter {
Some(turn_id.clone()),
agent_type.to_string(),
Some(self.workspace_path_string()),
None,
None,
DialogSubmissionPolicy::for_source(DialogTriggerSource::Cli),
None,
)
Expand Down
97 changes: 60 additions & 37 deletions src/apps/desktop/src/api/agentic_api.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ use bitfun_core::agentic::deep_review_policy::{
};
use bitfun_core::agentic::goal_mode::{ThreadGoal, ThreadGoalStatus};
use bitfun_core::agentic::image_analysis::ImageContextData;
use bitfun_core::agentic::session::{SessionViewRestoreRequest, SessionViewRestoreTiming};
use bitfun_core::agentic::session::SessionViewRestoreTiming;
use bitfun_core::agentic::tools::image_context::get_image_context;
use bitfun_core::agentic::tools::implementations::exec_command::{
background_command_output_capture, control_exec_command_session, send_exec_command_input,
Expand Down Expand Up @@ -114,6 +114,8 @@ pub struct StartDialogTurnRequest {
pub original_user_input: Option<String>,
pub agent_type: String,
pub workspace_path: Option<String>,
pub remote_connection_id: Option<String>,
pub remote_ssh_host: Option<String>,
pub turn_id: Option<String>,
#[serde(default)]
pub image_contexts: Option<Vec<ImageContextData>>,
Expand Down Expand Up @@ -761,7 +763,7 @@ pub async fn update_session_title(
.await;

coordinator
.restore_session(&effective, session_id)
.restore_session_from_storage_path(&effective, session_id)
.await
.map_err(|e| format!("Failed to restore session before renaming: {}", e))?;
}
Expand Down Expand Up @@ -806,10 +808,12 @@ pub async fn ensure_coordinator_session(
.await;
let restore_result = if request.include_internal {
coordinator
.restore_internal_session(&effective, session_id)
.restore_internal_session_from_storage_path(&effective, session_id)
.await
} else {
coordinator.restore_session(&effective, session_id).await
coordinator
.restore_session_from_storage_path(&effective, session_id)
.await
};
restore_result.map(|_| ()).map_err(|e| e.to_string())
}
Expand All @@ -827,6 +831,8 @@ pub async fn start_dialog_turn(
original_user_input,
agent_type,
workspace_path,
remote_connection_id,
remote_ssh_host,
turn_id,
image_contexts,
user_message_metadata,
Expand All @@ -851,6 +857,8 @@ pub async fn start_dialog_turn(
turn_id,
agent_type,
workspace_path,
remote_connection_id,
remote_ssh_host,
policy,
None,
user_message_metadata,
Expand Down Expand Up @@ -897,7 +905,7 @@ pub async fn compact_session(
)
.await;
coordinator
.restore_session(&effective, session_id)
.restore_session_from_storage_path(&effective, session_id)
.await
.map_err(|e| format!("Failed to restore session before compacting: {}", e))?;
}
Expand Down Expand Up @@ -945,7 +953,7 @@ pub async fn activate_session_goal(
)
.await;
coordinator
.restore_session(&effective, session_id)
.restore_session_from_storage_path(&effective, session_id)
.await
.map_err(|e| format!("Failed to restore session before activating goal mode: {e}"))?;
}
Expand Down Expand Up @@ -995,7 +1003,7 @@ async fn ensure_session_for_thread_goal(
)
.await;
coordinator
.restore_session(&effective, session_id)
.restore_session_from_storage_path(&effective, session_id)
.await
.map_err(|e| format!("Failed to restore session before thread goal access: {e}"))?;
}
Expand All @@ -1008,14 +1016,23 @@ async fn ensure_session_for_thread_goal(
.ok_or_else(|| format!("Session workspace_path is missing: {session_id}"))
}

async fn resolve_session_workspace_path_for_thread_goal_read(
async fn resolve_thread_goal_storage_path(
coordinator: &Arc<ConversationCoordinator>,
app_state: &AppState,
session_id: &str,
workspace_path: Option<&str>,
remote_connection_id: Option<&str>,
remote_ssh_host: Option<&str>,
) -> Result<PathBuf, String> {
if let Some(storage_path) = coordinator
.get_session_manager()
.resolve_session_workspace_binding(session_id)
.await
.map(|binding| binding.session_storage_dir())
{
return Ok(storage_path);
}

if let Some(workspace_path) = coordinator
.get_session_manager()
.get_session(session_id)
Expand Down Expand Up @@ -1051,7 +1068,7 @@ pub async fn get_session_thread_goal(
if session_id.is_empty() {
return Err("session_id is required".to_string());
}
let workspace_path = resolve_session_workspace_path_for_thread_goal_read(
let storage_path = resolve_thread_goal_storage_path(
coordinator.inner(),
app_state.inner(),
session_id,
Expand All @@ -1061,7 +1078,7 @@ pub async fn get_session_thread_goal(
)
.await?;
let goal = coordinator
.get_thread_goal(session_id, workspace_path.as_path())
.get_thread_goal(session_id, storage_path.as_path())
.await
.map_err(|error| error.to_string())?;
Ok(GetSessionThreadGoalResponse { goal })
Expand Down Expand Up @@ -1205,7 +1222,7 @@ pub async fn run_init_agents_md(
)
.await;
coordinator
.restore_session(&effective, session_id)
.restore_session_from_storage_path(&effective, session_id)
.await
.map_err(|e| format!("Failed to restore session before running /init: {e}"))?;
}
Expand All @@ -1221,6 +1238,8 @@ pub async fn run_init_agents_md(
.submit_init_agents_md(
session_id.to_string(),
workspace_path,
request.remote_connection_id.clone(),
request.remote_ssh_host.clone(),
DialogSubmissionPolicy::for_source(DialogTriggerSource::DesktopUi),
)
.await
Expand Down Expand Up @@ -1694,11 +1713,11 @@ pub async fn restore_session(
.await;
let session = if request.include_internal {
coordinator
.restore_internal_session(&effective_path, &request.session_id)
.restore_internal_session_from_storage_path(&effective_path, &request.session_id)
.await
} else {
coordinator
.restore_session(&effective_path, &request.session_id)
.restore_session_from_storage_path(&effective_path, &request.session_id)
.await
}
.map_err(|e| format!("Failed to restore session: {}", e))?;
Expand Down Expand Up @@ -1727,48 +1746,45 @@ pub async fn restore_session_view(
request.remote_connection_id.as_deref(),
request.remote_ssh_host.as_deref(),
)
.await;
.await;
let resolve_storage_path_duration_ms =
path_started_at.elapsed().as_millis().min(u64::MAX as u128) as u64;
debug!(
"restore_session_view storage path resolved: trace_id={}, session_id={}, duration_ms={}",
trace_id,
request.session_id,
path_started_at.elapsed().as_millis()
resolve_storage_path_duration_ms
);

let view_request = SessionViewRestoreRequest {
workspace_path: effective_path,
session_id: request.session_id.clone(),
include_internal: request.include_internal,
tail_turn_count: request.tail_turn_count,
};
let tail_turn_count = view_request
let session_storage_path = effective_path;
let tail_turn_count = request
.tail_turn_count
.filter(|count| *count > 0)
.map(|count| count.min(16));
let (session, mut turns, total_turn_count, timings) =
let (session, mut turns, total_turn_count, mut timings) =
if let Some(tail_turn_count) = tail_turn_count {
if view_request.include_internal {
if request.include_internal {
coordinator
.restore_internal_session_view_tail_timed(
&view_request.workspace_path,
&view_request.session_id,
.restore_internal_session_view_from_storage_path_tail_timed(
&session_storage_path,
&request.session_id,
tail_turn_count,
)
.await
} else {
coordinator
.restore_session_view_tail_timed(
&view_request.workspace_path,
&view_request.session_id,
.restore_session_view_from_storage_path_tail_timed(
&session_storage_path,
&request.session_id,
tail_turn_count,
)
.await
}
} else if view_request.include_internal {
} else if request.include_internal {
coordinator
.restore_internal_session_view_timed(
&view_request.workspace_path,
&view_request.session_id,
.restore_internal_session_view_from_storage_path_timed(
&session_storage_path,
&request.session_id,
)
.await
.map(|(session, turns, timings)| {
Expand All @@ -1777,14 +1793,18 @@ pub async fn restore_session_view(
})
} else {
coordinator
.restore_session_view_timed(&view_request.workspace_path, &view_request.session_id)
.restore_session_view_from_storage_path_timed(
&session_storage_path,
&request.session_id,
)
.await
.map(|(session, turns, timings)| {
let total_turn_count = turns.len();
(session, turns, total_turn_count, timings)
})
}
.map_err(|e| format!("Failed to restore session view: {}", e))?;
timings.resolve_storage_path_duration_ms = resolve_storage_path_duration_ms;
let loaded_turn_count = turns.len();
let is_partial = loaded_turn_count < total_turn_count;

Expand Down Expand Up @@ -1865,11 +1885,14 @@ pub async fn restore_session_with_turns(
);
let (session, turns) = if request.include_internal {
coordinator
.restore_internal_session_with_turns(&effective_path, &request.session_id)
.restore_internal_session_with_turns_from_storage_path(
&effective_path,
&request.session_id,
)
.await
} else {
coordinator
.restore_session_with_turns(&effective_path, &request.session_id)
.restore_session_with_turns_from_storage_path(&effective_path, &request.session_id)
.await
}
.map_err(|e| format!("Failed to restore session: {}", e))?;
Expand Down
2 changes: 2 additions & 0 deletions src/apps/desktop/src/api/miniapp_agent_api.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,8 @@ pub async fn miniapp_agent_run(
Some(submission_plan.run_id.clone()),
MINIAPP_AGENT_KIND.to_string(),
Some(submission_plan.workspace_path.clone()),
None,
None,
policy,
None,
Some(submission_plan.metadata.clone()),
Expand Down
Loading
Loading