mirror of
https://github.com/openai/codex.git
synced 2026-05-03 10:56:37 +00:00
chore: merge name and title (#17116)
Merge title and name concept to leverage the sqlite title column and have more efficient queries --------- Co-authored-by: Codex <noreply@openai.com>
This commit is contained in:
@@ -60,6 +60,7 @@ use codex_core::config::resolve_oss_provider;
|
||||
use codex_core::config_loader::ConfigLoadError;
|
||||
use codex_core::config_loader::LoaderOverrides;
|
||||
use codex_core::config_loader::format_config_error_with_source;
|
||||
use codex_core::find_thread_meta_by_name_str;
|
||||
use codex_core::format_exec_policy_error_with_source;
|
||||
use codex_core::path_utils;
|
||||
use codex_feedback::CodexFeedback;
|
||||
@@ -1256,6 +1257,27 @@ async fn resolve_resume_thread_id(
|
||||
if Uuid::parse_str(session_id).is_ok() {
|
||||
return Ok(Some(session_id.to_string()));
|
||||
}
|
||||
if let Some(state_db) = codex_core::get_state_db(config).await {
|
||||
let cwd = (!args.all).then_some(config.cwd.as_path());
|
||||
let resolved = state_db
|
||||
.find_thread_by_exact_title(
|
||||
session_id,
|
||||
&[],
|
||||
/*model_providers*/ None,
|
||||
/*archived_only*/ false,
|
||||
cwd,
|
||||
)
|
||||
.await?;
|
||||
if let Some(thread) = resolved {
|
||||
return Ok(Some(thread.id.to_string()));
|
||||
}
|
||||
if let Some((_, session_meta)) =
|
||||
find_thread_meta_by_name_str(&config.codex_home, session_id).await?
|
||||
&& (args.all || cwds_match(config.cwd.as_path(), &session_meta.meta.cwd))
|
||||
{
|
||||
return Ok(Some(session_meta.meta.id.to_string()));
|
||||
}
|
||||
}
|
||||
|
||||
let mut cursor = None;
|
||||
loop {
|
||||
@@ -1271,10 +1293,7 @@ async fn resolve_resume_thread_id(
|
||||
source_kinds: Some(all_thread_source_kinds()),
|
||||
archived: Some(false),
|
||||
cwd: None,
|
||||
// Thread names are attached separately from rollout titles, so name
|
||||
// resolution must scan the filtered list client-side instead of relying
|
||||
// on the backend `search_term` filter.
|
||||
search_term: None,
|
||||
search_term: Some(session_id.to_string()),
|
||||
},
|
||||
},
|
||||
"thread/list",
|
||||
|
||||
Reference in New Issue
Block a user