Support thread-level originator overrides by alexsong-oai · Pull Request #29477 · openai/codex

alexsong-oai · 2026-06-22T20:34:56Z

Why

Work(TPP) threads can be launched from the Desktop app, but if they all keep the Desktop app's default originator then downstream attribution cannot distinguish local Work launches from cloud-backed Work launches. thread/start.serviceName already carries that launch signal, while SessionMeta.originator is the durable thread-level value that survives resume and fork.

This change converts the Desktop Work service names into an effective originator at thread creation time, persists that originator with the thread, and keeps using it for later model requests and memory writes.

What changed

Map CODEX_WORK_LOCAL and CODEX_WORK_CLOUD service names to per-thread originators, while preserving CODEX_INTERNAL_ORIGINATOR_OVERRIDE as the highest-precedence override.
Persist the effective originator in SessionMeta.originator, read it back on resume/fork, and inherit the parent originator for subagent spawns when there is no persisted session metadata.
Handle truncated SpawnAgentForkMode::LastNTurns forks by falling back to the live parent originator when the forked history no longer includes SessionMeta.
Thread the per-thread originator through Responses headers, websocket/compaction request paths, thread-store creation, rollout metadata, and memory stage-one telemetry.

Verification

just test -p codex-core agent::control::tests::spawn_thread_subagent_inherits_parent_originator_without_fork agent::control::tests::spawn_thread_subagent_fork_last_n_turns_inherits_parent_originator_without_session_meta thread_manager::tests::originator_override_precedes_service_name_remapping
just test -p codex-core agent::control::tests::resume_thread_subagent_restores_stored_metadata_and_effective_multi_agent_mode
just test -p codex-memories-write
just fix -p codex-core -p codex-memories-write
git diff --check

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 877c56ccf4

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

alexsong-oai · 2026-06-22T21:55:36Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 4cf080c27e

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 751c3f93ef

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

chatgpt-codex-connector · 2026-06-22T22:32:15Z

+    if service_name.eq_ignore_ascii_case("CODEX_WORK_LOCAL") {
+        return Some("codex_work_desktop_local".to_string());
+    }
+    if service_name.eq_ignore_ascii_case("CODEX_WORK_CLOUD") {
+        return Some("codex_work_desktop_cloud".to_string());


Document reserved serviceName originator mappings

When an app-server thread/start request uses serviceName of CODEX_WORK_LOCAL or CODEX_WORK_CLOUD, this branch now changes the persisted Responses originator, but the public app-server README still describes serviceName only as an optional metrics tag. Update the app-server docs/schema comments so clients know these two values have reserved originator semantics rather than being ordinary metric labels.

AGENTS.md reference: AGENTS.md:L288-L290

Useful? React with 👍 / 👎.

chatgpt-codex-connector · 2026-06-22T22:32:16Z

    provider: SharedModelProvider,
    auth_env_telemetry: AuthEnvTelemetry,
    session_source: SessionSource,
+    originator: String,


Route thread originator through realtime requests

When a Desktop Work thread starts a realtime conversation, this new session-scoped originator is never applied to the realtime startup paths: prepare_realtime_start builds realtime headers without an originator, and both websocket and WebRTC sideband setup fall back to default_headers(), so those model requests still use the process default originator instead of the persisted Work originator. If Work threads can use realtime, add the thread originator to the realtime extra headers just like the Responses/compaction paths.

Useful? React with 👍 / 👎.

…t-originator # Conflicts: # codex-rs/core/src/client_tests.rs

jif-oai

Fix the cargo shear please
And I see a bit of redundance in the tests.. can we prefer one (or a few) strong tests that covers more widely the code? (and do not test what is trivial btw)

jif-oai · 2026-06-23T08:51:20Z


+fn originator_from_service_name(service_name: Option<&str>) -> Option<String> {
+    let service_name = service_name?.trim();
+    if service_name.eq_ignore_ascii_case("codex_work_desktop") {


why? This sounds super ad-hoc... what about CODEX_WORK_LOCAL/CODEX_WORK_CLOUD you discuss in the PR?

Previously, I recall being able to start a cloud task from Work in the desktop app, but in the latest nightly build, I can only start a local task. So I renamed it to codex_work_desktop to differentiate it from codex_desktop, and Work on web.

jif-oai · 2026-06-23T08:51:48Z

            self.state.beta_features_header.as_deref(),
            turn_state.as_ref(),
        ));
+        add_originator_header(&mut extra_headers, self.state.originator.as_str());


Can we apply the thread originator to summarize_memories() too? It is the remaining ModelClient request path that falls back to the process-global originator, so Work-thread memory summaries are attributed differently from the other model requests

jif-oai · 2026-06-23T08:52:38Z

+        .await
+        .expect("child thread should be registered");
+    let child_snapshot = child_thread.config_snapshot().await;
+    assert_eq!(child_snapshot.originator, parent_snapshot.originator);


These tests stop at config_snapshot()...

alexsong-oai requested a review from a team as a code owner June 22, 2026 20:34

alexsong-oai marked this pull request as draft June 22, 2026 20:36

chatgpt-codex-connector Bot reviewed Jun 22, 2026

View reviewed changes

Comment thread codex-rs/core/src/thread_manager.rs

Comment thread codex-rs/core/src/thread_manager.rs Outdated

Comment thread codex-rs/memories/write/src/runtime.rs

alexsong-oai force-pushed the codex/inherit-subagent-originator branch 3 times, most recently from 66a650c to 4cf080c Compare June 22, 2026 21:53

alexsong-oai changed the title ~~Inherit thread originator across spawns~~ Persist Desktop Work originators across thread lifecycle Jun 22, 2026

chatgpt-codex-connector Bot reviewed Jun 22, 2026

View reviewed changes

Comment thread codex-rs/core/src/thread_manager.rs

alexsong-oai force-pushed the codex/inherit-subagent-originator branch from 4cf080c to 54bf697 Compare June 22, 2026 22:04

alexsong-oai added the code-reviewed label Jun 22, 2026

Inherit thread originator across spawns

751c3f9

alexsong-oai force-pushed the codex/inherit-subagent-originator branch from 54bf697 to 751c3f9 Compare June 22, 2026 22:23

alexsong-oai marked this pull request as ready for review June 22, 2026 22:23

alexsong-oai changed the title ~~Persist Desktop Work originators across thread lifecycle~~ Support thread-level originator Jun 22, 2026

alexsong-oai changed the title ~~Support thread-level originator~~ Support thread-level originator overrides Jun 22, 2026

Merge branch 'main' into codex/inherit-subagent-originator

b509346

chatgpt-codex-connector Bot reviewed Jun 22, 2026

View reviewed changes

alexsong-oai added 3 commits June 22, 2026 17:02

Inherit thread originator across spawns

a793830

Track Work desktop originator in analytics

6f2cb18

Merge remote-tracking branch 'origin/main' into codex/inherit-subagen…

fe53591

…t-originator # Conflicts: # codex-rs/core/src/client_tests.rs

jif-oai reviewed Jun 23, 2026

View reviewed changes

Conversation

alexsong-oai commented Jun 22, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Why

What changed

Verification

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

Uh oh!

alexsong-oai commented Jun 22, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector Bot Jun 22, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

chatgpt-codex-connector Bot Jun 22, 2026

Choose a reason for hiding this comment

Uh oh!

jif-oai left a comment

Choose a reason for hiding this comment

Uh oh!

jif-oai Jun 23, 2026

Choose a reason for hiding this comment

Uh oh!

alexsong-oai Jun 23, 2026

Choose a reason for hiding this comment

Uh oh!

jif-oai Jun 23, 2026

Choose a reason for hiding this comment

Uh oh!

jif-oai Jun 23, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

alexsong-oai commented Jun 22, 2026 •

edited

Loading