Support thread-level originator overrides#29477
Conversation
![chatgpt-codex-connector[bot]](https://avatars.githubusercontent.com/in/1144995?s=60&v=4){kind=small}
There was a problem hiding this comment.
💡 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
force-pushed
the
codex/inherit-subagent-originator
branch
3 times, most recently
from
66a650c to
4cf080c
Compare
alexsong-oai
changed the title
|
@codex review |
There was a problem hiding this comment.
💡 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".
alexsong-oai
force-pushed
the
codex/inherit-subagent-originator
branch
from
4cf080c to
54bf697
Compare
alexsong-oai
force-pushed
the
codex/inherit-subagent-originator
branch
from
54bf697 to
751c3f9
Compare
alexsong-oai
changed the title
alexsong-oai
changed the title
There was a problem hiding this comment.
💡 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".
…t-originator # Conflicts: # codex-rs/core/src/client_tests.rs
jif-oai
left a comment
jif-oai
left a comment
There was a problem hiding this comment.
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)
|
|
||
| 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") { |
There was a problem hiding this comment.
why? This sounds super ad-hoc... what about CODEX_WORK_LOCAL/CODEX_WORK_CLOUD you discuss in the PR?
There was a problem hiding this comment.
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.
| pub model_slug: String, | ||
| pub thread_id: String, | ||
| pub turn_id: String, | ||
| pub product_client_id: String, |
There was a problem hiding this comment.
This only fixes the custom tracking-context events. The normal thread/turn/tool/compaction events still use the connection-wide product_client_id, so Work and non-Work threads on the same Desktop connection remain indistinguishable
There was a problem hiding this comment.
I'll addresses this in another PR
2 participants
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.serviceNamealready carries that launch signal, whileSessionMeta.originatoris 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
CODEX_WORK_LOCALandCODEX_WORK_CLOUDservice names to per-thread originators, while preservingCODEX_INTERNAL_ORIGINATOR_OVERRIDEas the highest-precedence override.SessionMeta.originator, read it back on resume/fork, and inherit the parent originator for subagent spawns when there is no persisted session metadata.SpawnAgentForkMode::LastNTurnsforks by falling back to the live parent originator when the forked history no longer includesSessionMeta.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_remappingjust test -p codex-core agent::control::tests::resume_thread_subagent_restores_stored_metadata_and_effective_multi_agent_modejust test -p codex-memories-writejust fix -p codex-core -p codex-memories-writegit diff --check