Trim pre-turn context updates during rollback by charley-oai · Pull Request #15577 · openai/codex

charley-oai · 2026-03-23T22:58:49Z

Summary

trim contiguous developer/contextual-user pre-turn updates when rollback cuts back to a user turn
add a focused history regression test for the trim behavior
update the rollback request-boundary snapshots to show the fixed non-duplicating context shape

charley-oai · 2026-03-23T23:11:31Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 9f41208b00

ℹ️ 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-03-23T23:16:03Z

codex-rs/core/src/context_manager/history.rs

+        return false;
+    };
+
+    role == "developer" || (role == "user" && is_contextual_user_message_content(content))


Narrow rollback trim to true context-update developer messages

is_pre_turn_context_update_item classifies all role == "developer" messages as pre-turn context updates. drop_last_n_user_turns then strips contiguous developer items before the rollback boundary, which can delete non-context developer instructions (for example reminders/injected guidance) that are not re-emitted automatically. This causes rollback to lose valid history, not just duplicate context diffs.

Useful? React with 👍 / 👎.

ugh ok I'll add is_contextual_dev_message_content

charley-oai · 2026-03-23T23:40:22Z

codex-rs/core/src/event_mapping.rs

+    COLLABORATION_MODE_OPEN_TAG,
+    REALTIME_CONVERSATION_OPEN_TAG,
+    "<personality_spec>",
+];


This will be cleaned up with a grand unified context framework soon 🙏

charley-oai · 2026-03-23T23:41:14Z

@codex review

chatgpt-codex-connector · 2026-03-23T23:46:24Z

Codex Review: Didn't find any major issues. 👍

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

charley-oai · 2026-03-24T02:49:12Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: e04d468e63

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

codex-rs/core/src/event_mapping.rs

Co-authored-by: Codex <noreply@openai.com>

charley-oai · 2026-03-24T04:39:49Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 93bde6adb2

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

codex-rs/core/src/codex/rollout_reconstruction.rs

charley-oai · 2026-03-24T06:17:59Z

@codex review

chatgpt-codex-connector

💡 Codex Review

codex/codex-rs/core/src/codex/rollout_reconstruction.rs

Line 275 in bc1cfc3

history.drop_last_n_user_turns(rollback.num_turns);

Clear reference context when rollback trims mixed bundle

Use the boolean returned by drop_last_n_user_turns here. That method now signals when rollback removed a developer message containing both contextual and non-context fragments; in that case reference_context_item must be cleared. Ignoring it leaves a stale baseline, so the next turn may emit only diffs and fail to reinject dropped non-context instructions (permissions/plugin guidance).

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

charley-oai · 2026-03-24T06:51:37Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: a520b7b276

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

codex-rs/core/src/context_manager/history.rs

Co-authored-by: Codex <noreply@openai.com>

charley-oai · 2026-03-24T19:26:34Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: dcb0a1b579

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

codex-rs/core/src/context_manager/history.rs

chatgpt-codex-connector bot reviewed Mar 23, 2026

View reviewed changes

charley-oai commented Mar 23, 2026

View reviewed changes

charley-oai force-pushed the codex/rollback-context-trim-fix branch from 2e30a38 to e04d468 Compare March 24, 2026 02:49

chatgpt-codex-connector bot reviewed Mar 24, 2026

View reviewed changes

codex-rs/core/src/event_mapping.rs Show resolved Hide resolved

Trim rollback context bundles and clear stale baseline

93bde6a

Co-authored-by: Codex <noreply@openai.com>

charley-oai force-pushed the codex/rollback-context-trim-fix branch from e04d468 to 93bde6a Compare March 24, 2026 04:37

chatgpt-codex-connector bot reviewed Mar 24, 2026

View reviewed changes

codex-rs/core/src/codex/rollout_reconstruction.rs Outdated Show resolved Hide resolved

remove rollout reconstruction diff

bc1cfc3

chatgpt-codex-connector bot reviewed Mar 24, 2026

View reviewed changes

improve docs

a520b7b

chatgpt-codex-connector bot reviewed Mar 24, 2026

View reviewed changes

codex-rs/core/src/context_manager/history.rs Outdated Show resolved Hide resolved

aibrahim-oai reviewed Mar 24, 2026

View reviewed changes

codex-rs/core/src/context_manager/history.rs Outdated Show resolved Hide resolved

aibrahim-oai approved these changes Mar 24, 2026

View reviewed changes

Clarify rollback context trimming

dcb0a1b

Co-authored-by: Codex <noreply@openai.com>

chatgpt-codex-connector bot reviewed Mar 24, 2026

View reviewed changes

codex-rs/core/src/context_manager/history.rs Show resolved Hide resolved

charley-oai merged commit 2d61357 into main Mar 24, 2026
33 of 35 checks passed

charley-oai deleted the codex/rollback-context-trim-fix branch March 24, 2026 19:43

github-actions bot locked and limited conversation to collaborators Mar 24, 2026

Conversation

charley-oai commented Mar 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Uh oh!

charley-oai commented Mar 23, 2026

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector bot Mar 23, 2026

Choose a reason for hiding this comment

Uh oh!

charley-oai Mar 23, 2026

Choose a reason for hiding this comment

Uh oh!

charley-oai Mar 23, 2026

Choose a reason for hiding this comment

Uh oh!

charley-oai commented Mar 23, 2026

Uh oh!

chatgpt-codex-connector bot commented Mar 23, 2026

Uh oh!

charley-oai commented Mar 24, 2026

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

charley-oai commented Mar 24, 2026

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

charley-oai commented Mar 24, 2026

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

charley-oai commented Mar 24, 2026

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

charley-oai commented Mar 24, 2026

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

charley-oai commented Mar 23, 2026 •

edited

Loading