mirror of
https://github.com/openai/codex.git
synced 2026-11-20 07:06:24 +00:00
Expose thread originators through the app-server API (#42458)
## What changed - Add the creation-time `originator` to app-server thread responses and `thread/started` notifications. - Persist originators in thread metadata and preserve the first recorded value across list, read, resume, rollout, and SQLite paths. - Add an `originators` allowlist to `thread/list` for hosted backends. The local app-server accepts omitted or empty values but rejects nonempty filters. ## Testing - Cover originator persistence across server restarts and list, read, and resume requests. - Verify local `thread/list` handling for nonempty, omitted, null, and empty originator filters. - Heap-allocate large TUI dispatcher futures in affected tests to keep them within the Windows test-thread stack. GitOrigin-RevId: 73ad6e61b8fdd2d93a22d1f971723a19ec7be3fc
This commit is contained in:
1 parent
8ff74cc9b1
commit
728cb12fe5
75 files changed
+511
-12
No files matched your search
@@ -50,6 +50,8 @@ pub struct ThreadsPage {
|
||||
/// Summary information for a thread rollout file.
|
||||
#[derive(Debug, PartialEq, Default)]
|
||||
pub struct ThreadItem {
|
||||
/// Originator recorded at creation, if available.
|
||||
pub originator: Option<String>,
|
||||
/// Absolute path to the rollout file.
|
||||
pub path: PathBuf,
|
||||
/// Thread ID from session metadata.
|
||||
@@ -106,6 +108,7 @@ pub type ConversationsPage = ThreadsPage;
|
||||
|
||||
#[derive(Default)]
|
||||
struct HeadTailSummary {
|
||||
originator: Option<String>,
|
||||
saw_session_meta: bool,
|
||||
thread_id: Option<ThreadId>,
|
||||
first_user_message: Option<String>,
|
||||
@@ -815,6 +818,7 @@ async fn build_thread_item(
|
||||
// Apply filters: must have session meta and a discoverable preview.
|
||||
if summary.saw_session_meta && summary.preview.is_some() {
|
||||
let HeadTailSummary {
|
||||
originator,
|
||||
thread_id,
|
||||
first_user_message,
|
||||
preview,
|
||||
@@ -837,6 +841,7 @@ async fn build_thread_item(
|
||||
summary_updated_at = updated_at.or_else(|| created_at.clone());
|
||||
}
|
||||
return Some(ThreadItem {
|
||||
originator,
|
||||
path,
|
||||
thread_id,
|
||||
first_user_message,
|
||||
@@ -1146,6 +1151,8 @@ async fn read_head_summary(path: &Path, head_limit: usize) -> io::Result<HeadTai
|
||||
match rollout_line.item {
|
||||
RolloutItem::SessionMeta(session_meta_line) => {
|
||||
if !summary.saw_session_meta {
|
||||
summary.originator = (!session_meta_line.meta.originator.is_empty())
|
||||
.then(|| session_meta_line.meta.originator.clone());
|
||||
summary.source = Some(session_meta_line.meta.source.clone());
|
||||
summary.history_mode = session_meta_line.meta.history_mode;
|
||||
summary.parent_thread_id = session_meta_line.meta.parent_thread_id;
|
||||
|
||||
@@ -48,6 +48,8 @@ pub(crate) fn builder_from_session_meta(
|
||||
session_meta.meta.source.clone(),
|
||||
);
|
||||
builder.history_mode = session_meta.meta.history_mode;
|
||||
builder.originator =
|
||||
(!session_meta.meta.originator.is_empty()).then(|| session_meta.meta.originator.clone());
|
||||
builder.model_provider = session_meta.meta.model_provider.clone();
|
||||
builder.agent_nickname = session_meta.meta.agent_nickname.clone();
|
||||
builder.agent_role = session_meta.meta.agent_role.clone();
|
||||
|
||||
@@ -1282,6 +1282,7 @@ async fn fill_missing_thread_item_metadata_from_state_db(
|
||||
|
||||
fn fill_missing_thread_item_metadata(item: &mut ThreadItem, state_item: ThreadItem) {
|
||||
let ThreadItem {
|
||||
originator,
|
||||
path: _state_path,
|
||||
thread_id: _state_thread_id,
|
||||
first_user_message,
|
||||
@@ -1306,6 +1307,10 @@ fn fill_missing_thread_item_metadata(item: &mut ThreadItem, state_item: ThreadIt
|
||||
recency_at,
|
||||
} = state_item;
|
||||
|
||||
if item.originator.is_none() {
|
||||
item.originator = originator;
|
||||
}
|
||||
|
||||
if item.first_user_message.is_none() {
|
||||
item.first_user_message = first_user_message;
|
||||
}
|
||||
@@ -2024,6 +2029,7 @@ fn thread_item_from_state_metadata(
|
||||
parent_thread_id: Option<ThreadId>,
|
||||
) -> ThreadItem {
|
||||
ThreadItem {
|
||||
originator: item.originator,
|
||||
path: item.rollout_path,
|
||||
thread_id: Some(item.id),
|
||||
first_user_message: item.first_user_message,
|
||||
|
||||
@@ -1594,6 +1594,7 @@ fn fill_missing_thread_item_metadata_preserves_identity_and_prefers_state_git_fi
|
||||
let filesystem_path = PathBuf::from("/tmp/filesystem-rollout.jsonl");
|
||||
let state_path = PathBuf::from("/tmp/state-rollout.jsonl");
|
||||
let mut item = ThreadItem {
|
||||
originator: None,
|
||||
path: filesystem_path.clone(),
|
||||
thread_id: Some(filesystem_thread_id),
|
||||
first_user_message: Some("filesystem message".to_string()),
|
||||
@@ -1621,6 +1622,7 @@ fn fill_missing_thread_item_metadata_preserves_identity_and_prefers_state_git_fi
|
||||
updated_at: None,
|
||||
};
|
||||
let state_item = ThreadItem {
|
||||
originator: None,
|
||||
path: state_path,
|
||||
thread_id: Some(state_thread_id),
|
||||
first_user_message: Some("state message".to_string()),
|
||||
|
||||
@@ -719,6 +719,7 @@ async fn test_list_conversations_latest_first() {
|
||||
let expected = ThreadsPage {
|
||||
items: vec![
|
||||
ThreadItem {
|
||||
originator: Some("test_originator".to_string()),
|
||||
path: p1,
|
||||
thread_id: Some(thread_id_from_uuid(u3)),
|
||||
first_user_message: Some("Hello from user".to_string()),
|
||||
@@ -743,6 +744,7 @@ async fn test_list_conversations_latest_first() {
|
||||
updated_at: updated_times.first().cloned().flatten(),
|
||||
},
|
||||
ThreadItem {
|
||||
originator: Some("test_originator".to_string()),
|
||||
path: p2,
|
||||
thread_id: Some(thread_id_from_uuid(u2)),
|
||||
first_user_message: Some("Hello from user".to_string()),
|
||||
@@ -767,6 +769,7 @@ async fn test_list_conversations_latest_first() {
|
||||
updated_at: updated_times.get(1).cloned().flatten(),
|
||||
},
|
||||
ThreadItem {
|
||||
originator: Some("test_originator".to_string()),
|
||||
path: p3,
|
||||
thread_id: Some(thread_id_from_uuid(u1)),
|
||||
first_user_message: Some("Hello from user".to_string()),
|
||||
@@ -884,6 +887,7 @@ async fn test_pagination_cursor() {
|
||||
let expected_page1 = ThreadsPage {
|
||||
items: vec![
|
||||
ThreadItem {
|
||||
originator: Some("test_originator".to_string()),
|
||||
path: p5,
|
||||
thread_id: Some(thread_id_from_uuid(u5)),
|
||||
first_user_message: Some("Hello from user".to_string()),
|
||||
@@ -908,6 +912,7 @@ async fn test_pagination_cursor() {
|
||||
updated_at: updated_page1.first().cloned().flatten(),
|
||||
},
|
||||
ThreadItem {
|
||||
originator: Some("test_originator".to_string()),
|
||||
path: p4,
|
||||
thread_id: Some(thread_id_from_uuid(u4)),
|
||||
first_user_message: Some("Hello from user".to_string()),
|
||||
@@ -968,6 +973,7 @@ async fn test_pagination_cursor() {
|
||||
let expected_page2 = ThreadsPage {
|
||||
items: vec![
|
||||
ThreadItem {
|
||||
originator: Some("test_originator".to_string()),
|
||||
path: p3,
|
||||
thread_id: Some(thread_id_from_uuid(u3)),
|
||||
first_user_message: Some("Hello from user".to_string()),
|
||||
@@ -992,6 +998,7 @@ async fn test_pagination_cursor() {
|
||||
updated_at: updated_page2.first().cloned().flatten(),
|
||||
},
|
||||
ThreadItem {
|
||||
originator: Some("test_originator".to_string()),
|
||||
path: p2,
|
||||
thread_id: Some(thread_id_from_uuid(u2)),
|
||||
first_user_message: Some("Hello from user".to_string()),
|
||||
@@ -1044,6 +1051,7 @@ async fn test_pagination_cursor() {
|
||||
page3.items.iter().map(|i| i.updated_at.clone()).collect();
|
||||
let expected_page3 = ThreadsPage {
|
||||
items: vec![ThreadItem {
|
||||
originator: Some("test_originator".to_string()),
|
||||
path: p1,
|
||||
thread_id: Some(thread_id_from_uuid(u1)),
|
||||
first_user_message: Some("Hello from user".to_string()),
|
||||
@@ -1221,6 +1229,7 @@ async fn test_get_thread_contents() {
|
||||
.join(format!("rollout-2025-04-01T10-30-00-{uuid}.jsonl"));
|
||||
let expected_page = ThreadsPage {
|
||||
items: vec![ThreadItem {
|
||||
originator: Some("test_originator".to_string()),
|
||||
path: expected_path,
|
||||
thread_id: Some(thread_id_from_uuid(uuid)),
|
||||
first_user_message: Some("Hello from user".to_string()),
|
||||
@@ -1626,6 +1635,7 @@ async fn test_timestamp_only_cursor_skips_same_second_filesystem_ties() {
|
||||
let expected_page1 = ThreadsPage {
|
||||
items: vec![
|
||||
ThreadItem {
|
||||
originator: Some("test_originator".to_string()),
|
||||
path: p3,
|
||||
thread_id: Some(thread_id_from_uuid(u3)),
|
||||
first_user_message: Some("Hello from user".to_string()),
|
||||
@@ -1650,6 +1660,7 @@ async fn test_timestamp_only_cursor_skips_same_second_filesystem_ties() {
|
||||
updated_at: updated_page1.first().cloned().flatten(),
|
||||
},
|
||||
ThreadItem {
|
||||
originator: Some("test_originator".to_string()),
|
||||
path: p2,
|
||||
thread_id: Some(thread_id_from_uuid(u2)),
|
||||
first_user_message: Some("Hello from user".to_string()),
|
||||
|
||||
Reference in new issue
Block a user