Cleanup collaboration mode variants #10404

charley-oai · 2026-02-02T19:34:52Z

Summary

This PR simplifies collaboration modes to the visible set default | plan, while preserving backward compatibility for older partners that may still send legacy mode
names.

Specifically:

Renames the old Code behavior to Default.
Keeps Plan as-is.
Removes Custom mode behavior (fallbacks now resolve to Default).
Keeps PairProgramming and Execute internally for compatibility plumbing, while removing them from schema/API and UI visibility.
Adds legacy input aliasing so older clients can still send old mode names.

What Changed

Mode enum and compatibility

ModeKind now uses Plan + Default as active/public modes.
ModeKind::Default deserialization accepts legacy values:
- code
- pair_programming
- execute
- custom
PairProgramming and Execute variants remain in code but are hidden from protocol/schema generation.
Custom variant is removed; previous custom fallbacks now map to Default.

Collaboration presets and templates

Built-in presets now return only:
- Plan
- Default
Template rename:
- core/templates/collaboration_mode/code.md -> default.md
execute.md and pair_programming.md remain on disk but are not surfaced in visible preset lists.

TUI updates

Updated user-facing naming and prompts from “Code” to “Default”.
Updated mode-cycle and indicator behavior to reflect only visible Plan and Default.
Updated corresponding tests and snapshots.

request_user_input behavior

request_user_input remains allowed only in Plan mode.
Rejection messaging now consistently treats non-plan modes as Default.

Schemas

Regenerated config and app-server schemas.
Public schema types now advertise mode values as:
- plan
- default

Backward Compatibility Notes

Incoming legacy mode names (code, pair_programming, execute, custom) are accepted and coerced to default.
Outgoing/public schema surfaces intentionally expose only plan | default.
This allows tolerant ingestion of older partner payloads while standardizing new integrations on the reduced mode set.

Codex author

codex fork 019c1fae-693b-7840-b16e-9ad38ea0bd00

charley-oai · 2026-02-02T19:35:07Z

@codex review this

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 675868a725

ℹ️ 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/protocol/src/config_types.rs

charley-oai · 2026-02-03T01:28:46Z

@codex review this

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: d298a6d112

ℹ️ 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/tui/src/chatwidget.rs

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

@codex review this

charley-oai · 2026-02-03T02:18:02Z

@codex review this

chatgpt-codex-connector · 2026-02-03T02:24:51Z

Codex Review: Didn't find any major issues. Can't wait for the next one!

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

shijie-oai · 2026-02-03T06:46:49Z

codex-rs/core/config.schema.json

          ],
          "default": null,
-          "description": "Start the TUI in the specified collaboration mode (plan/execute/etc.). Defaults to unset."
+          "description": "Start the TUI in the specified collaboration mode (plan/default). Defaults to unset."


Defaults to unset - is this still accurate?

"Defaults to unset" is still technically accurate for the config field itself:

tui.experimental_mode is Option with #[serde(default)], so missing value deserializes to None (schema default: null).

But behavior-wise, None now means:

no explicit override selected by the user, and then

if collaboration modes are enabled, startup resolves to the Default preset (not Plan) via the runtime fallback.

shijie-oai · 2026-02-03T06:48:07Z

codex-rs/core/src/codex.rs

        // TODO (aibrahim): Consolidate config.model and config.model_reasoning_effort into config.collaboration_mode
        // to avoid extracting these fields separately and constructing CollaborationMode here.


Just want to point out that we need to think hard about migration path forward if we need to do that. Currently we are not even tracking them.

shijie-oai · 2026-02-03T06:49:00Z

codex-rs/core/src/features.rs

    Steer,
-    /// Enable collaboration modes (Plan, Code, Pair Programming, Execute).
+    /// Enable collaboration modes (Plan, Default).
    CollaborationModes,


Should we just remove this? I am not sure if we are going to turn this off at anytime in the future.

I guess we have to also remove the enable flag on app side as we do that.

Makes sense, will do in followup PR

shijie-oai

Overall looks straight forward - one concern I do have (might be outdated info) is when we go from plan -> code, we also tell the model that we are exiting plan mode. want to make sure that behavior is not lost. Also let @aibrahim-oai take another look.

chatgpt-codex-connector bot reviewed Feb 2, 2026

View reviewed changes

codex-rs/protocol/src/config_types.rs Show resolved Hide resolved

Reduce collaboration modes to plan/default with legacy aliases

d298a6d

charley-oai force-pushed the modes-code-cleanup branch from 675868a to d298a6d Compare February 3, 2026 01:28

chatgpt-codex-connector bot reviewed Feb 3, 2026

View reviewed changes

codex-rs/tui/src/chatwidget.rs Outdated Show resolved Hide resolved

charley-oai added 4 commits February 2, 2026 17:41

Keep pair mode behavior while hiding protocol/TUI exposure

0f5230b

nit

63d6910

Apply default collaboration preset when modes are enabled

50d81bd

Alias execute mode name to default in request_user_input

01dd8a0

charley-oai changed the title ~~Reduce modes variant to just Default | Plan (for now)~~ Cleanup modes variants Feb 3, 2026

charley-oai changed the title ~~Cleanup modes variants~~ Cleanup Collaboration Mode Variants Feb 3, 2026

charley-oai changed the title ~~Cleanup Collaboration Mode Variants~~ Cleanup collaboration mode variants Feb 3, 2026

lint

8c54e07

shijie-oai reviewed Feb 3, 2026

View reviewed changes

shijie-oai approved these changes Feb 3, 2026

View reviewed changes

aibrahim-oai approved these changes Feb 3, 2026

View reviewed changes

charley-oai merged commit d509df6 into main Feb 3, 2026
48 of 53 checks passed

charley-oai deleted the modes-code-cleanup branch February 3, 2026 17:23

github-actions bot locked and limited conversation to collaborators Feb 3, 2026

		// TODO (aibrahim): Consolidate config.model and config.model_reasoning_effort into config.collaboration_mode
		// to avoid extracting these fields separately and constructing CollaborationMode here.

Cleanup collaboration mode variants #10404

Cleanup collaboration mode variants #10404

Uh oh!

Conversation

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

Uh oh!

Summary

What Changed

Backward Compatibility Notes

Codex author

Uh oh!

charley-oai commented Feb 2, 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 Feb 3, 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 Feb 3, 2026

Uh oh!

charley-oai commented Feb 3, 2026

Uh oh!

chatgpt-codex-connector bot commented Feb 3, 2026

Uh oh!

shijie-oai Feb 3, 2026

Choose a reason for hiding this comment

Uh oh!

charley-oai Feb 3, 2026

Choose a reason for hiding this comment

Uh oh!

shijie-oai Feb 3, 2026

Choose a reason for hiding this comment

Uh oh!

shijie-oai Feb 3, 2026

Choose a reason for hiding this comment

Uh oh!

shijie-oai Feb 3, 2026

Choose a reason for hiding this comment

Uh oh!

charley-oai Feb 3, 2026

Choose a reason for hiding this comment

Uh oh!

shijie-oai left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

charley-oai commented Feb 2, 2026 •

edited

Loading