Skip to content

[3 of 7] Remove UserTurn#23075

Merged
etraut-openai merged 1 commit into
mainfrom
etraut/next-turn-state-input-op-consolidation
May 19, 2026
Merged

[3 of 7] Remove UserTurn#23075
etraut-openai merged 1 commit into
mainfrom
etraut/next-turn-state-input-op-consolidation

Conversation

@etraut-openai
Copy link
Copy Markdown
Collaborator

@etraut-openai etraut-openai commented May 16, 2026

Stack position: [3 of 7]

Summary

This PR finishes the input-op consolidation by moving the remaining Op::UserTurn callers onto Op::UserInput and deleting Op::UserTurn. This touches a lot of files, but it is a low-risk mechanical migration.

Stack

  1. [1 of 7] Add thread settings to UserInput
  2. [2 of 7] Remove UserInputWithTurnContext
  3. [3 of 7] Remove UserTurn (this PR)
  4. [4 of 7] Placeholder for OverrideTurnContext cleanup
  5. [5 of 7] Replace OverrideTurnContext with ThreadSettings
  6. [6 of 7] Add app-server thread settings API
  7. [7 of 7] Sync TUI thread settings

@etraut-openai etraut-openai requested a review from a team as a code owner May 16, 2026 20:19
Copy link
Copy Markdown
Contributor

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 30f6ab2372

ℹ️ 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".

Comment thread codex-rs/protocol/src/protocol.rs Outdated
@etraut-openai etraut-openai changed the title [1 of 4] Consolidate core input ops [3 of 6] Remove UserTurn May 16, 2026
@etraut-openai etraut-openai changed the base branch from main to etraut/next-turn-state-remove-user-input-with-context May 16, 2026 21:25
@etraut-openai etraut-openai changed the title [3 of 6] Remove UserTurn [3 of 7] Remove UserTurn May 16, 2026
Copy link
Copy Markdown
Contributor

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: db6e9bfaa9

ℹ️ 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".

Comment thread codex-rs/protocol/src/protocol.rs
Comment thread codex-rs/core/tests/suite/prompt_caching.rs
Comment thread codex-rs/core/tests/suite/remote_models.rs Outdated
Copy link
Copy Markdown
Contributor

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 50435559f4

ℹ️ 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".

Comment thread codex-rs/core/tests/common/test_codex.rs Outdated
Comment thread codex-rs/core/src/guardian/review_session.rs Outdated
etraut-openai added a commit that referenced this pull request May 19, 2026
**Stack position:** [1 of 7]

## Summary

The first three PRs in this stack are a cleanup pass before the actual
thread settings API work.

Today, core has several overlapping "user input" ops: `UserInput`,
`UserInputWithTurnContext`, and `UserTurn`. They differ mostly in how
much next-turn state they carry, which makes the later queued thread
settings update harder to reason about and review.

This PR starts that cleanup by adding the shared
`ThreadSettingsOverrides` payload and allowing `Op::UserInput` to carry
it. Existing variants remain in place here, so this layer is mostly a
behavior-preserving API shape change plus mechanical constructor
updates.

## End State After PR3

By the end of PR3, `Op::UserInput` is the only "user input" core op. It
can carry optional thread settings overrides for callers that need to
update stored defaults with a turn, while callers without updates use
empty settings. `Op::UserInputWithTurnContext` and `Op::UserTurn` are
deleted.

## End State After PR5

By the end of PR5, core will have only two ops for this area:

- `Op::UserInput` for user-input-bearing submissions.
- `Op::ThreadSettings` for settings-only updates.

## Stack

1. [1 of 7] [Add thread settings to
UserInput](#23080) (this PR)
2. [2 of 7] [Remove
UserInputWithTurnContext](#23081)
3. [3 of 7] [Remove
UserTurn](#23075)
4. [4 of 7] [Placeholder for OverrideTurnContext
cleanup](#23087)
5. [5 of 7] [Replace OverrideTurnContext with
ThreadSettings](#22508)
6. [6 of 7] [Add app-server thread settings
API](#22509)
7. [7 of 7] [Sync TUI thread
settings](#22510)
@etraut-openai etraut-openai force-pushed the etraut/next-turn-state-remove-user-input-with-context branch from d3052c6 to 6927359 Compare May 19, 2026 02:17
etraut-openai added a commit that referenced this pull request May 19, 2026
**Stack position:** [2 of 7]

## Summary

This PR removes the overlapping `Op::UserInputWithTurnContext` variant
now that `Op::UserInput` can carry thread settings overrides directly.

## Stack

1. [1 of 7] [Add thread settings to
UserInput](#23080)
2. [2 of 7] [Remove
UserInputWithTurnContext](#23081)
(this PR)
3. [3 of 7] [Remove
UserTurn](#23075)
4. [4 of 7] [Placeholder for OverrideTurnContext
cleanup](#23087)
5. [5 of 7] [Replace OverrideTurnContext with
ThreadSettings](#22508)
6. [6 of 7] [Add app-server thread settings
API](#22509)
7. [7 of 7] [Sync TUI thread
settings](#22510)
Base automatically changed from etraut/next-turn-state-remove-user-input-with-context to main May 19, 2026 02:41
@etraut-openai etraut-openai force-pushed the etraut/next-turn-state-input-op-consolidation branch from 45fe8ff to e940365 Compare May 19, 2026 02:44
@etraut-openai etraut-openai merged commit 1a25d8b into main May 19, 2026
31 checks passed
@etraut-openai etraut-openai deleted the etraut/next-turn-state-input-op-consolidation branch May 19, 2026 02:56
@github-actions github-actions Bot locked and limited conversation to collaborators May 19, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants