mirror of
https://github.com/openai/codex.git
synced 2026-11-18 22:20:48 +00:00
Extract TUI thread resume finalization (#62171)
## What changed Move subscription state updates, history hydration, and resumed session setup into `finish_thread_resume`. Let callers supply a `HistoryHydrationScope` and keep using `HistoryHydrationScope::Initial` for the existing resume path. GitOrigin-RevId: ebb8b422827a2374d8dce194e8d59afe57327f29
This commit is contained in:
committed by
copyberry
parent
345f166d01
commit
409973e0e2
@@ -291,7 +291,7 @@ impl AppServerSession {
|
||||
})
|
||||
.await;
|
||||
drop(rollout_maintenance_guard);
|
||||
let mut response: ThreadResumeResponse = match resume_response {
|
||||
let response: ThreadResumeResponse = match resume_response {
|
||||
Ok(response) => response,
|
||||
Err(TypedRequestError::Server { source, .. })
|
||||
if params.exclude_turns && is_history_pagination_unsupported(&source) =>
|
||||
@@ -313,6 +313,24 @@ impl AppServerSession {
|
||||
));
|
||||
}
|
||||
};
|
||||
self.finish_thread_resume(
|
||||
local_settings,
|
||||
&config,
|
||||
thread_id,
|
||||
response,
|
||||
HistoryHydrationScope::Initial,
|
||||
)
|
||||
.await
|
||||
}
|
||||
|
||||
pub(crate) async fn finish_thread_resume(
|
||||
&mut self,
|
||||
local_settings: &crate::local_settings::LocalSettings,
|
||||
config: &Config,
|
||||
thread_id: ThreadId,
|
||||
mut response: ThreadResumeResponse,
|
||||
scope: HistoryHydrationScope<'_>,
|
||||
) -> Result<AppServerStartedThread> {
|
||||
if let Some(subscribed) = &mut self.attachment_subscribed {
|
||||
*subscribed = true;
|
||||
}
|
||||
@@ -320,9 +338,9 @@ impl AppServerSession {
|
||||
&mut response.thread,
|
||||
response.turns_backwards_cursor.clone(),
|
||||
response.items_backwards_cursor.clone(),
|
||||
Some(&config),
|
||||
Some(config),
|
||||
Some(local_settings),
|
||||
HistoryHydrationScope::Initial,
|
||||
scope,
|
||||
)
|
||||
.await?;
|
||||
let fork_parent_title = self
|
||||
|
||||
Reference in New Issue
Block a user