Tui: use collaboration mode instead of model and effort #9507

aibrahim-oai · 2026-01-19T23:54:44Z

Only use collaboration modes in the tui state to track model and effort.
No behavior change without the collaboration modes flag.
Change model and effort on /model, /collab (behind a flag), and shift+tab (behind flag)

aibrahim-oai · 2026-01-20T04:21:45Z

@codex review this

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 9f56b1be80

ℹ️ 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-01-20T04:26:07Z

codex-rs/tui/src/chatwidget.rs

+        // Update stored collaboration mode with model and reasoning effort from session.
+        self.stored_collaboration_mode = CollaborationMode::Custom(Settings {
+            model: model_for_header.clone(),
+            reasoning_effort: event.reasoning_effort,
+            developer_instructions: None,


Preserve collaboration mode after session configured

When on_session_configured runs, it unconditionally replaces stored_collaboration_mode with CollaborationMode::Custom and clears developer_instructions. If the Collaboration Modes feature is enabled, this wipes the default/selected Plan/Pair/Execute variant as soon as the session is configured, so subsequent Op::UserTurn submissions carry Custom and no collaboration instructions until the user manually reselects a mode. This means the default collaboration mode never actually applies in normal flows (session configured → user sends first message). Consider preserving the existing variant and only updating model/effort (e.g., via with_updates) instead of forcing Custom.

Useful? React with 👍 / 👎.

aibrahim-oai · 2026-01-20T06:22:55Z

@codex review this

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: dd86ec0fb2

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

codex-rs/tui2/src/chatwidget.rs

aibrahim-oai · 2026-01-20T06:39:05Z

@codex review this

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: c60c0ece11

ℹ️ 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/status/card.rs

aibrahim-oai · 2026-01-20T07:08:37Z

@codex review this

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 6d089fd938

ℹ️ 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/app.rs

codex-rs/tui2/src/app.rs

aibrahim-oai · 2026-01-20T07:32:47Z

@codex review this

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 0f913bf94a

ℹ️ 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/app.rs

aibrahim-oai · 2026-01-20T07:46:49Z

@codex review this

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 334824f9e2

ℹ️ 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-01-20T07:53:45Z

codex-rs/tui/src/app.rs

+            AppEvent::UpdateCollaborationMode(mode) => {
+                self.chat_widget.set_collaboration_mode(mode);


Update current_model when collaboration mode changes

When collaboration modes are enabled, selecting a preset can change the effective model stored in the widget (the mode carries its own model/effort), but the UpdateCollaborationMode handler only updates the widget and leaves current_model untouched. current_model is later used to seed new sessions/forks/resumes, so after switching to a mode that uses a different model, starting a new session will still use the previous model. Consider syncing current_model (and any related in-memory config) to mode.model() when handling UpdateCollaborationMode so session restarts reflect the user’s selected collaboration mode.

Useful? React with 👍 / 👎.

@codex fix this by removing current model and use collaboration modes mainly for getting current model

Summary

Removed App-level current_model tracking and now seed new/resumed sessions from the ChatWidget’s collaboration-mode-backed model value. codex-rs/tui/src/app.rsL320-L725

Exposed current_model on ChatWidget so the app can read the collaboration-mode model directly. codex-rs/tui/src/chatwidget.rsL4242-L4260

Testing

✅ just fmt

❌ just fix -p codex-tui (fails: tui2/src/status/card.rs uses private module sandbox_summary)

❌ cargo test -p codex-tui (fails: tui2/src/status/card.rs uses private module sandbox_summary)

View task →

aibrahim-oai · 2026-01-20T08:41:53Z

@codex review this

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 2b363d8bab

ℹ️ 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-01-20T08:52:08Z

codex-rs/tui/src/chatwidget.rs

            config,
-            model,
-            collaboration_mode: CollaborationModeSelection::default(),
+            stored_collaboration_mode,
            auth_manager,
            models_manager,
            session_header: SessionHeader::new(model_for_header),


Keep header model in sync with collab default

When Feature::CollaborationModes is enabled, stored_collaboration_mode is initialized from the default preset (currently hard‑coded to gpt-5.2-codex), but the session header is still constructed from model_for_header (config/session model). If those differ (e.g., config still points at gpt‑5.1), the UI will show the old model while Op::UserTurn is sent with the preset model, so users are misled about which model they’re actually using. Consider deriving the header model from stored_collaboration_mode.model() or calling set_model after selecting the default mode.

Useful? React with 👍 / 👎.

codex-rs/tui2/src/chatwidget.rs

aibrahim-oai · 2026-01-20T09:24:14Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: b8eed88685

ℹ️ 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-01-20T09:33:08Z

codex-rs/tui/src/app.rs

    fn on_update_reasoning_effort(&mut self, effort: Option<ReasoningEffortConfig>) {
        self.chat_widget.set_reasoning_effort(effort);


Keep config effort in sync for new sessions

The new on_update_reasoning_effort only updates the widget and no longer updates self.config.model_reasoning_effort. As a result, when a user changes reasoning effort (via /model or the popup) and then starts a new session in the same run, AppEvent::NewSession builds the new ChatWidgetInit from self.config.clone(), so the session configuration reverts to the old effort. This is a regression in the non-collaboration flow because the selected effort no longer carries over across /new without restarting. Consider updating the in-memory config here or explicitly passing the stored collaboration mode’s effort into new sessions.

Useful? React with 👍 / 👎.

aibrahim-oai · 2026-01-20T09:45:10Z

@codex review this

aibrahim-oai · 2026-01-20T09:52:44Z

@codex review this

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 8bd8302753

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

aibrahim-oai · 2026-01-20T10:12:22Z

@codex review this

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: ded72b61d6

ℹ️ 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-01-20T10:27:38Z

codex-rs/tui/src/chatwidget.rs

        let model = model.filter(|m| !m.trim().is_empty());
-        config.model = model.clone();
+        let config = config;
        let mut rng = rand::rng();
        let placeholder = PLACEHOLDERS[rng.random_range(0..PLACEHOLDERS.len())].to_string();
        let codex_op_tx = spawn_agent(config.clone(), app_event_tx.clone(), thread_manager);


New sessions start with stale model from config

In ChatWidget::new, the selected model from ChatWidgetInit is no longer copied into config before calling spawn_agent. spawn_agent passes this config into ThreadManager::start_thread, which derives the session model from config.model. Because AppEvent::UpdateModel now only updates the widget (not self.config), starting a new session after /model will spin up the thread with the old model while the UI shows the new one. Consider restoring config.model = model.clone() (or otherwise wiring the selected model into the Config passed to core).

Useful? React with 👍 / 👎.

chatgpt-codex-connector · 2026-01-20T10:27:38Z

codex-rs/tui2/src/chatwidget.rs

        let model = model.filter(|m| !m.trim().is_empty());
-        config.model = model.clone();
+        let config = config;
        let mut rng = rand::rng();
        let placeholder = PLACEHOLDERS[rng.random_range(0..PLACEHOLDERS.len())].to_string();
        let codex_op_tx = spawn_agent(config.clone(), app_event_tx.clone(), thread_manager);


New sessions start with stale model from config

Same issue in the TUI2 implementation: the selected model from ChatWidgetInit is not copied into config before spawn_agent, so start_thread still uses the old config.model. After a /model change, creating a new session will silently use the previous model while the UI reflects the updated selection. The config passed to core needs to be updated with the selected model.

Useful? React with 👍 / 👎.

aibrahim-oai · 2026-01-20T17:56:18Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: b773f91130

ℹ️ 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-01-20T18:07:19Z

codex-rs/tui/src/chatwidget.rs

+        // Only update stored collaboration settings when collaboration modes are disabled.
+        // When enabled, we preserve the selected variant (Plan/Pair/Execute/Custom) and its
+        // instructions as-is; the session configured event should not override it.
+        if !self.collaboration_modes_enabled() {
+            self.stored_collaboration_mode = self.stored_collaboration_mode.with_updates(


Keep collaboration mode in sync with SessionConfigured

When collaboration modes are enabled, this handler skips updating stored_collaboration_mode from the SessionConfiguredEvent. If the configured session model/effort differs from the stored preset (e.g., after resuming/forking a session or a server-side model migration), the TUI will keep the stale mode and the next Op::UserTurn will send the wrong model/effort, silently overriding the session configuration. Consider updating the stored collaboration mode with event.model/event.reasoning_effort while preserving the current variant/instructions so the TUI stays consistent with the configured session.

Useful? React with 👍 / 👎.

aibrahim-oai force-pushed the collab branch from 37ac291 to 59dbaaf Compare January 20, 2026 00:02

chatgpt-codex-connector bot reviewed Jan 20, 2026

View reviewed changes

shijie-oai approved these changes Jan 20, 2026

View reviewed changes

chatgpt-codex-connector bot reviewed Jan 20, 2026

View reviewed changes

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

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

chatgpt-codex-connector bot reviewed Jan 20, 2026

View reviewed changes

codex-rs/tui/src/status/card.rs Outdated Show resolved Hide resolved

chatgpt-codex-connector bot reviewed Jan 20, 2026

View reviewed changes

codex-rs/tui/src/app.rs Show resolved Hide resolved

codex-rs/tui2/src/app.rs Show resolved Hide resolved

chatgpt-codex-connector bot reviewed Jan 20, 2026

View reviewed changes

codex-rs/tui/src/app.rs Show resolved Hide resolved

chatgpt-codex-connector bot reviewed Jan 20, 2026

View reviewed changes

aibrahim-oai force-pushed the collab branch from 6254afe to 9540f0e Compare January 20, 2026 08:33

Squash collab changes

2b363d8

aibrahim-oai force-pushed the collab branch from 9540f0e to 2b363d8 Compare January 20, 2026 08:41

chatgpt-codex-connector bot reviewed Jan 20, 2026

View reviewed changes

status

b8eed88

status

94afe18

chatgpt-codex-connector bot reviewed Jan 20, 2026

View reviewed changes

aibrahim

8bd8302

chatgpt-codex-connector bot reviewed Jan 20, 2026

View reviewed changes

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

fix

ded72b6

chatgpt-codex-connector bot reviewed Jan 20, 2026

View reviewed changes

fix

b773f91

chatgpt-codex-connector bot reviewed Jan 20, 2026

View reviewed changes

aibrahim-oai merged commit 5ae6e70 into main Jan 20, 2026
30 of 32 checks passed

aibrahim-oai deleted the collab branch January 20, 2026 18:26

github-actions bot locked and limited conversation to collaborators Jan 20, 2026

		AppEvent::UpdateCollaborationMode(mode) => {
		self.chat_widget.set_collaboration_mode(mode);

		fn on_update_reasoning_effort(&mut self, effort: Option<ReasoningEffortConfig>) {
		self.chat_widget.set_reasoning_effort(effort);

Tui: use collaboration mode instead of model and effort #9507

Tui: use collaboration mode instead of model and effort #9507

Uh oh!

Conversation

aibrahim-oai commented Jan 19, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

aibrahim-oai commented Jan 20, 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 Jan 20, 2026

Choose a reason for hiding this comment

Uh oh!

aibrahim-oai commented Jan 20, 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!

aibrahim-oai commented Jan 20, 2026

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

aibrahim-oai commented Jan 20, 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!

aibrahim-oai commented Jan 20, 2026

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

aibrahim-oai commented Jan 20, 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 Jan 20, 2026

Choose a reason for hiding this comment

Uh oh!

aibrahim-oai Jan 20, 2026

Choose a reason for hiding this comment

Uh oh!

chatgpt-codex-connector bot Jan 20, 2026

Choose a reason for hiding this comment

Uh oh!

aibrahim-oai commented Jan 20, 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 Jan 20, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

aibrahim-oai commented Jan 20, 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 Jan 20, 2026

Choose a reason for hiding this comment

Uh oh!

aibrahim-oai commented Jan 19, 2026 •

edited

Loading